OSDN Git Service
Bart Sears [Tue, 25 Aug 2015 06:22:20 +0000 (23:22 -0700)]
Set the Security Patch level for MNC
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug:
23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
smain@google.com [Thu, 20 Aug 2015 00:36:57 +0000 (17:36 -0700)]
fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Dirk Dougherty [Sat, 15 Aug 2015 04:18:36 +0000 (21:18 -0700)]
adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
Joe Fernandez [Thu, 13 Aug 2015 23:02:37 +0000 (23:02 +0000)]
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 19:37:34 +0000 (12:37 -0700)]
doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
Chris Banes [Thu, 13 Aug 2015 17:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
Mike Dodd [Thu, 13 Aug 2015 15:16:38 +0000 (15:16 +0000)]
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
Chris Banes [Thu, 13 Aug 2015 08:38:12 +0000 (09:38 +0100)]
Make sure only AppCompat (not it's tests) are in the docs
BUG:
23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:20 +0000 (16:11 -0700)]
Fix issie #
23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base AOSP telephony builds.
b/
23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
Ian Pedowitz [Wed, 12 Aug 2015 19:41:54 +0000 (19:41 +0000)]
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:53:47 +0000 (18:53 +0000)]
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:45 +0000 (18:48 +0000)]
Revert "Include new AOSP messaging app in base builds."
This reverts commit
a8b0905e165448857ad45d1633c545c53bd53a5e.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
Ian Pedowitz [Wed, 12 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug:
23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
Mike Dodd [Wed, 12 Aug 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
Tao Bao [Wed, 12 Aug 2015 06:55:21 +0000 (06:55 +0000)]
am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:19:06 +0000 (23:19 -0700)]
skip the merge of
67e7c661 to lmp-mr1-ub-dev
The change (
007979ee) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
Tao Bao [Wed, 12 Aug 2015 05:18:37 +0000 (05:18 +0000)]
am
007979ee: Add support for clobbered blocks
* commit '
007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
Tao Bao [Tue, 12 May 2015 18:42:31 +0000 (11:42 -0700)]
Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/
20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit
ff7778166bd13a90c89fa333591ee2037f587a11)
Ian Pedowitz [Tue, 11 Aug 2015 21:54:17 +0000 (21:54 +0000)]
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
Clay Murphy [Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)]
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base builds.
b/
23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
Ian Pedowitz [Tue, 11 Aug 2015 19:48:46 +0000 (12:48 -0700)]
Increasing arm(64)? emulator partition sizes to 1.5GB
Bug:
23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
Ian Pedowitz [Tue, 11 Aug 2015 19:12:28 +0000 (19:12 +0000)]
Merge "Increasing x86 emulator system partition size" into mnc-dev
Ian Pedowitz [Tue, 11 Aug 2015 17:02:15 +0000 (10:02 -0700)]
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
Ian Pedowitz [Tue, 11 Aug 2015 14:50:04 +0000 (07:50 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
Ian Pedowitz [Tue, 11 Aug 2015 03:18:41 +0000 (20:18 -0700)]
Increasing x86 emulator system partition size
Seems sdk_google_phone_x86 is building larger than 750MB
Bug:
23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
Omari Stephens [Sat, 6 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Add the ability to display annotations in the generated docs
(cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86)
Bug:
8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Yusuf Ozuysal [Fri, 7 Aug 2015 00:10:39 +0000 (00:10 +0000)]
Merge "Add support-customtabs to the doc build." into mnc-dev
Ying Wang [Mon, 3 Aug 2015 21:06:58 +0000 (14:06 -0700)]
Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug:
22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
Dianne Hackborn [Fri, 31 Jul 2015 17:37:50 +0000 (17:37 +0000)]
Merge "Remove M codename, version number is 6.0." into mnc-dev
Benoit Lize [Fri, 31 Jul 2015 15:35:58 +0000 (17:35 +0200)]
Add support-customtabs to the doc build.
b/
22795013
Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
Tony Mantler [Thu, 30 Jul 2015 19:56:08 +0000 (19:56 +0000)]
Merge "Add support preference libraries to docs build" into mnc-dev
Tony Mantler [Thu, 30 Jul 2015 18:22:24 +0000 (11:22 -0700)]
Add support preference libraries to docs build
b/
22795957
Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
Tao Bao [Wed, 29 Jul 2015 21:09:23 +0000 (14:09 -0700)]
Read fstab from the source build.
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.
Bug:
21948974
Change-Id: I8b6a18f64b412f782184f9d382544ed0ce093fb4
(cherry picked from commit
dd24da9ec91b74b7e3c8d1af9f1f9f792d41ac4d)
Dianne Hackborn [Wed, 29 Jul 2015 21:22:51 +0000 (14:22 -0700)]
Remove M codename, version number is 6.0.
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
Miao Wang [Wed, 29 Jul 2015 19:07:48 +0000 (19:07 +0000)]
Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
Ian Pedowitz [Wed, 29 Jul 2015 18:48:26 +0000 (18:48 +0000)]
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
Miao Wang [Wed, 29 Jul 2015 18:46:23 +0000 (11:46 -0700)]
[RenderScript] Only upgrade RS target API for compat build.
- Fix build
Bug:
22796994
Bug:
22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
Ian Pedowitz [Wed, 29 Jul 2015 17:37:24 +0000 (10:37 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
Miao Wang [Wed, 29 Jul 2015 00:43:51 +0000 (17:43 -0700)]
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Bug:
22796994
Bug:
22693954
This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).
Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
George Mount [Mon, 27 Jul 2015 14:49:18 +0000 (14:49 +0000)]
am
56f7b775: (-s ours) am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
56f7b77520f182a42e181a0f6dba78559007c532':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:35:51 +0000 (14:35 +0000)]
am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
a58413554455248dcaea3ad1c022316c1e3288e7':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Dan Albert [Tue, 23 Jun 2015 20:32:30 +0000 (13:32 -0700)]
Revert "Revert "Hide unwinder symbols in each binary.""
Bug:
18471342
Bug:
19958712
This reverts commit
61f675bb53f31fb2500fc135603ca7a5f7620d8e.
Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
(cherry picked from commit
686a5576890b3d5ea48ddc9da52b0c8aca75f876)
Ying Wang [Tue, 21 Jul 2015 01:40:18 +0000 (18:40 -0700)]
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug:
22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
George Mount [Mon, 13 Jul 2015 23:44:44 +0000 (16:44 -0700)]
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Bug
22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
Ying Wang [Thu, 2 Jul 2015 18:05:27 +0000 (11:05 -0700)]
Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.
Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
(cherry picked from commit
75011b2003733edc483a45d61f5cb1a23f64bfbf)
Ying Wang [Thu, 16 Jul 2015 18:51:19 +0000 (18:51 +0000)]
Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev
George Mount [Thu, 16 Jul 2015 14:18:41 +0000 (14:18 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
Ying Wang [Thu, 16 Jul 2015 01:33:24 +0000 (18:33 -0700)]
Don't uncompress/page-align the jni libraries in apps_only build.
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.
Bug:
22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
George Mount [Mon, 13 Jul 2015 23:44:44 +0000 (16:44 -0700)]
Add data binding to built javadoc.
Bug
22175560
Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
Thierry Strudel [Mon, 13 Jul 2015 21:40:36 +0000 (14:40 -0700)]
oem_image/custom_image: fix missing new parameter to build_image.py
Bug:
22441494
Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Tao Bao [Fri, 10 Jul 2015 20:44:24 +0000 (20:44 +0000)]
Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev
Tao Bao [Fri, 10 Jul 2015 00:37:49 +0000 (17:37 -0700)]
Zero out blocks that may be touched by dm-verity.
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.
Bug:
20881595
Change-Id: I54e24e70ad822c0d6d7af43301f74d24505f4461
Thierry Strudel [Thu, 9 Jul 2015 16:54:55 +0000 (09:54 -0700)]
fix device specific fs_config on build server
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
fs_config
fs_get_stats used by mktarball.sh
make_ext4fs used by mkuserimg.sh
mksquashfs used by mksquashfsimage.sh
Bug:
21989305
Bug:
22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Dirk Dougherty [Wed, 8 Jul 2015 11:44:24 +0000 (11:44 +0000)]
am
0da02191: am
aee6585c: Update js/css versions and add pt-br.
* commit '
0da02191ccc2030a3b4ac81500fdcabb72570049':
Update js/css versions and add pt-br.
Dirk Dougherty [Wed, 8 Jul 2015 11:29:45 +0000 (11:29 +0000)]
am
aee6585c: Update js/css versions and add pt-br.
* commit '
aee6585c3237b11f33b83e9dd96d93449e3e2259':
Update js/css versions and add pt-br.
Dirk Dougherty [Wed, 8 Jul 2015 11:21:57 +0000 (11:21 +0000)]
am
4187cee6: am
0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '
4187cee61b234a135ae2a62c876681a92e911893':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Dirk Dougherty [Wed, 8 Jul 2015 11:12:19 +0000 (04:12 -0700)]
Update js/css versions and add pt-br.
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
Dirk Dougherty [Wed, 8 Jul 2015 11:06:54 +0000 (11:06 +0000)]
am
0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '
0b9e204df09d9630db24f61bb427110501df6743':
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
dcashman [Mon, 6 Jul 2015 15:51:06 +0000 (15:51 +0000)]
Merge "Allow init to create /mnt/sdcard symlink." into mnc-dev
Chris Elliott [Thu, 2 Jul 2015 22:48:42 +0000 (22:48 +0000)]
am
a0cca8e6: (-s ours) am
1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
* commit '
a0cca8e66ac124c5d78fe35e10ece83c5314734b':
DO NOT MERGE Fix the syntax error in the edify script generator
Chris Elliott [Thu, 2 Jul 2015 22:36:55 +0000 (22:36 +0000)]
am
1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
* commit '
1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
DO NOT MERGE Fix the syntax error in the edify script generator
Dirk Dougherty [Thu, 2 Jul 2015 21:21:55 +0000 (14:21 -0700)]
Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
Chris Elliott [Thu, 2 Jul 2015 20:18:34 +0000 (20:18 +0000)]
Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
Tao Bao [Sun, 22 Mar 2015 21:20:48 +0000 (14:20 -0700)]
DO NOT MERGE Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.
Bug:
19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
Tao Bao [Thu, 2 Jul 2015 03:28:43 +0000 (03:28 +0000)]
am
41bcf3e4: (-s ours) Fix build.
* commit '
41bcf3e425b9a1792b65b16b1c115b018348bde7':
Fix build.
Tao Bao [Thu, 2 Jul 2015 02:38:34 +0000 (19:38 -0700)]
Fix build.
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
Tao Bao [Thu, 2 Jul 2015 02:14:36 +0000 (02:14 +0000)]
am
608d9d24: (-s ours) am
1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '
608d9d2452ba547875691f4df7ba313239177395':
sparse_img.py: Don't write empty map groups.
Simon Wilson [Thu, 2 Jul 2015 02:07:09 +0000 (02:07 +0000)]
am
e416a41f: (-s ours) am
16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '
e416a41f3ae1132c0eb53d78d3d6bc60f2f0d052':
Revert "sparse_img.py: Don't write empty map groups."
Tao Bao [Thu, 2 Jul 2015 01:06:33 +0000 (18:06 -0700)]
resolved conflicts for merge of
8787cd6d to mnc-dev
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
Tao Bao [Thu, 2 Jul 2015 00:47:51 +0000 (00:47 +0000)]
am
1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '
1aa1af0e997699bc025e4f0a754692068328d7e6':
sparse_img.py: Don't write empty map groups.
Simon Wilson [Thu, 2 Jul 2015 00:47:50 +0000 (00:47 +0000)]
am
16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '
16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
Revert "sparse_img.py: Don't write empty map groups."
Tao Bao [Thu, 2 Jul 2015 00:44:53 +0000 (17:44 -0700)]
resolved conflicts for merge of
7f9470cd to lmp-mr1-ub-dev
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
Tao Bao [Sat, 27 Jun 2015 00:49:39 +0000 (17:49 -0700)]
sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.
Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
Simon Wilson [Wed, 1 Jul 2015 18:10:28 +0000 (18:10 +0000)]
Revert "sparse_img.py: Don't write empty map groups."
This reverts commit
7f9470cda390ee61c0fc71491d0c649fbf6e02dd.
Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
Tao Bao [Sat, 27 Jun 2015 00:49:39 +0000 (17:49 -0700)]
sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.
Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
dcashman [Wed, 1 Jul 2015 16:12:43 +0000 (09:12 -0700)]
Allow init to create /mnt/sdcard symlink.
Addresses the following denial:
avc: denied { create } for pid=1 comm="init" name="sdcard" scontext=u:r:init:s0 tcontext=u:object_r:tmpfs:s0 tclass=lnk_file permissive=0
Bug:
22084499
Change-Id: Icffef8330d07b00f36fda11374e39e0df7181ca3
Tao Bao [Tue, 23 Jun 2015 18:16:05 +0000 (11:16 -0700)]
Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.
[1]: commit
efbb5d2e692283be32069e808b88522727c7fe98.
Bug:
21522719
Bug:
22023465
Bug:
22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
Tao Bao [Mon, 29 Jun 2015 19:49:21 +0000 (19:49 +0000)]
Revert "Adjust the size computation for reserved blocks"
We should not change the parameter to mkfs_ext4. Bug filed at
b/
22174684. Will come up with a new CL.
This reverts commit
efbb5d2e692283be32069e808b88522727c7fe98.
Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
Dianne Hackborn [Sat, 27 Jun 2015 00:29:18 +0000 (00:29 +0000)]
Merge "Raise API level to 23." into mnc-dev
Ying Wang [Fri, 26 Jun 2015 23:06:46 +0000 (23:06 +0000)]
Dianne Hackborn [Fri, 26 Jun 2015 22:54:10 +0000 (15:54 -0700)]
Raise API level to 23.
Now apps can target both MNC and 23.
Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
Ying Wang [Fri, 26 Jun 2015 21:06:32 +0000 (14:06 -0700)]
Fix conflict resolving error in
ef5dc90bba179f774bee0c7e479965cef12091de
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
Ying Wang [Fri, 26 Jun 2015 19:33:06 +0000 (12:33 -0700)]
Raise progaurd library to platform libraries even for "current" SDK.
Without this change, if an app with "LOCAL_SDK_VERSION := current" links
against a static library that uses removed APIs, the app will fail
ProGuard processing because the removed APIs can't be found in the
current SDK. This works around the issue.
Bug:
18510449
Bug:
20667396
Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
Mohamad Ayyash [Fri, 26 Jun 2015 00:24:05 +0000 (17:24 -0700)]
resolved conflicts for merge of
1a4658cd to mnc-dev
Mohamad Ayyash [Wed, 24 Jun 2015 23:54:12 +0000 (16:54 -0700)]
resolved conflicts for merge of
ef5dc90b to lmp-mr1-ub-dev
Mohamad Ayyash [Wed, 24 Jun 2015 23:16:18 +0000 (23:16 +0000)]
am
48cb24a6: am
648e40e8: build_image.py: Make sparse squashfs images
* commit '
48cb24a655b58c3b2147f120223627a357ad6372':
build_image.py: Make sparse squashfs images
Mohamad Ayyash [Wed, 24 Jun 2015 23:15:56 +0000 (23:15 +0000)]
Merge "build_image.py: Make sparse squashfs images" into mnc-dev
Simon Wilson [Wed, 24 Jun 2015 23:13:51 +0000 (23:13 +0000)]
Merge "resolved conflicts for merge of
ecfc97f7 to mnc-dev" into mnc-dev
Mohamad Ayyash [Wed, 24 Jun 2015 23:13:50 +0000 (23:13 +0000)]
Merge "Add img2simg in host and ota packages" into mnc-dev
Mohamad Ayyash [Wed, 24 Jun 2015 22:42:19 +0000 (15:42 -0700)]
Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Simon Wilson [Wed, 24 Jun 2015 23:06:34 +0000 (16:06 -0700)]
resolved conflicts for merge of
ecfc97f7 to mnc-dev
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
Mohamad Ayyash [Wed, 24 Jun 2015 22:42:19 +0000 (15:42 -0700)]
Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 24 Jun 2015 22:52:10 +0000 (22:52 +0000)]
am
648e40e8: build_image.py: Make sparse squashfs images
* commit '
648e40e8660135f37adad5981a48250476c2f3fd':
build_image.py: Make sparse squashfs images
Simon Wilson [Wed, 24 Jun 2015 22:42:27 +0000 (15:42 -0700)]
resolved conflicts for merge of
f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
Mohamad Ayyash [Wed, 24 Jun 2015 22:26:02 +0000 (22:26 +0000)]
am
9ca7fa89: resolved conflicts for merge of
1b748051 to lmp-mr1-ub-dev
* commit '
9ca7fa8993bceb97a6256b60742eeda2f699560b':
common.py: Add support for squashfs
Mohamad Ayyash [Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)]
resolved conflicts for merge of
1b748051 to lmp-mr1-ub-dev