OSDN Git Service
Ian Pedowitz [Wed, 29 Jul 2015 19:00:02 +0000 (19:00 +0000)]
am
96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
* commit '
96585b06dfb29023adc7097423c9ef266d13ac30':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
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:05:06 +0000 (18:05 +0000)]
am
302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit '
302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
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 15:02:40 +0000 (15:02 +0000)]
am
18cf7136: (-s ours) am
56f7b775: (-s ours) am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
18cf7136a686b9fbac837736445ca7f2edd5947e':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
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 [Wed, 22 Jul 2015 20:23:12 +0000 (20:23 +0000)]
am
215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
* commit '
215959e77d345899fbafa20f765b497b3ac37301':
Revert "Revert "Hide unwinder symbols in each binary.""
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 21:00:55 +0000 (21:00 +0000)]
am
c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit '
c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
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, 16 Jul 2015 22:18:19 +0000 (22:18 +0000)]
am
7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '
7ac6cb804083a67d31a16b910dabfb76b30150a3':
Add LOCAL_NO_LIBGCC.
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 19:01:55 +0000 (19:01 +0000)]
am
e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit '
e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
Don't uncompress/page-align the jni libraries in apps_only build.
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:29:34 +0000 (14:29 +0000)]
am
087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
087243ddcb61b602f4d4eb03022844021a659fda':
Add data binding to built javadoc.
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 23:31:15 +0000 (23:31 +0000)]
am
6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py
* commit '
6b74f21a4d3ff7ed7bb8463210263e9ecb27830a':
oem_image/custom_image: fix missing new parameter to build_image.py
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>
Paul Crowley [Mon, 13 Jul 2015 20:54:40 +0000 (20:54 +0000)]
Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev
Tao Bao [Mon, 13 Jul 2015 06:45:24 +0000 (23:45 -0700)]
Temporarily use blockimgdiff v2 for OTA.
angler and bullhead have smaller cache partiton (~100MB) and hit issue
with incremental OTA (such as MDA09B to MDA12) that requires more stash
space with BBOTA v3. Temporarily use v2 as a workaround, until we come
up with a real fix. Note that BBOTA v2 still uses some stash space, but
should be much smaller than v3.
Bug:
22430577
Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
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
Paul Crowley [Thu, 4 Jun 2015 08:59:33 +0000 (09:59 +0100)]
Build "secdiscard" for securely discarding data from flash devices.
Bug:
19706593
Change-Id: I073b7b39f25b054abdf2b983a63d029d690970a9
(cherry picked from commit
54a28654e605c73d42c66a552b8fc9c6255529cf)
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
Adam Powell [Wed, 24 Jun 2015 20:32:14 +0000 (20:32 +0000)]
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
Adam Powell [Wed, 24 Jun 2015 20:04:22 +0000 (13:04 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
Mohamad Ayyash [Wed, 24 Jun 2015 17:44:29 +0000 (10:44 -0700)]
build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 24 Jun 2015 17:44:29 +0000 (10:44 -0700)]
build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Michael Wright [Wed, 24 Jun 2015 14:55:21 +0000 (15:55 +0100)]
Add hid command to base build
Bug:
21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
Mohamad Ayyash [Wed, 24 Jun 2015 01:38:26 +0000 (01:38 +0000)]
am
f35ed6bd: resolved conflicts for merge of
cade49dd to lmp-mr1-ub-dev
* commit '
f35ed6bd8497633c057030e5442cd0fc29b37b6c':
Allow flashing a squashfs system image
Tao Bao [Wed, 24 Jun 2015 00:53:16 +0000 (00:53 +0000)]
Merge "Adjust the size computation for reserved blocks" into mnc-dev
Tao Bao [Wed, 24 Jun 2015 00:30:35 +0000 (17:30 -0700)]
Fix the error in sparse_img.py
Bug:
22046423
Change-Id: I9c257002c405277557974fadfe27942c38c3cd04
Mohamad Ayyash [Tue, 23 Jun 2015 23:22:32 +0000 (16:22 -0700)]
resolved conflicts for merge of
cade49dd to lmp-mr1-ub-dev
Tao Bao [Tue, 23 Jun 2015 18:16:05 +0000 (11:16 -0700)]
Adjust 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.
Bug:
21522719
Bug:
22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
Tao Bao [Tue, 23 Jun 2015 02:17:41 +0000 (19:17 -0700)]
Use fstab in the source build
When generating incremental OTAs, we should use the fstab in the source
build instead of the target one. Similarly for recovery_mount_options.
Bug:
22011892
Change-Id: Idb5c72d1a792e8bb40376a380e3dc06136b13652
Simon Wilson [Wed, 17 Jun 2015 19:35:15 +0000 (12:35 -0700)]
Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
leozwang [Mon, 22 Jun 2015 00:36:05 +0000 (00:36 +0000)]
Merge "Add BUILD NUMBER into oem image." into mnc-dev
leozwang [Wed, 17 Jun 2015 07:29:33 +0000 (00:29 -0700)]
Add BUILD NUMBER into oem image.
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
David Srbecky [Fri, 19 Jun 2015 18:25:56 +0000 (18:25 +0000)]
Merge "Pass --no-generate-debug-info to dex2oat." into mnc-dev
David Srbecky [Thu, 28 May 2015 15:32:55 +0000 (16:32 +0100)]
Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.
(cherry picked from commit
d8fae9a6a64dfa910d68d57fc820c1b1e4150f88)
Bug:
21924613
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
David Friedman [Wed, 17 Jun 2015 22:12:06 +0000 (22:12 +0000)]
am
552de126: am
42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '
552de126e9b05b1c34db1c66a62615fc2ea3cee1':
Docs: Fixing disappearance of the left-navs in NDK minisite.
David Friedman [Wed, 17 Jun 2015 21:57:47 +0000 (21:57 +0000)]
am
42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '
42c752392ceea6854c423339eedede6f4fdf6696':
Docs: Fixing disappearance of the left-navs in NDK minisite.
David Friedman [Wed, 17 Jun 2015 21:51:06 +0000 (21:51 +0000)]
Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
David Friedman [Wed, 17 Jun 2015 21:36:05 +0000 (14:36 -0700)]
Docs: Fixing disappearance of the left-navs in NDK minisite.
When the filepath changed from html-ndk/ndk/ to html/ndk, the build
system could no longer find the _toc files. This change fixes that issue.
Change-Id: I51f19159e6636fb90ed04013b11d7f95fb4e04c3
Mohamad Ayyash [Fri, 1 May 2015 22:39:36 +0000 (15:39 -0700)]
common.py: Add support for squashfs
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Tue, 3 Mar 2015 20:30:37 +0000 (12:30 -0800)]
Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Jeff Vander Stoep [Fri, 12 Jun 2015 16:56:39 +0000 (09:56 -0700)]
selinux: add tools to dev path
Adds audit2allow to the path. No build required.
(cherry picked from
5f50f0534067c3df5a531f142f5a879a0da95a02)
Bug:
21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
Tim Murray [Fri, 12 Jun 2015 18:37:10 +0000 (18:37 +0000)]
Merge "Add support for cortex-a53 variants when building 64-bit." into mnc-dev
C. Sean Young [Fri, 12 Jun 2015 17:43:46 +0000 (17:43 +0000)]
am
cbaead4c: am
540772fa: am
cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '
cbaead4cfe737c96c649672b6c1396c35597b5b7':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
C. Sean Young [Fri, 12 Jun 2015 16:29:25 +0000 (16:29 +0000)]
am
540772fa: am
cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '
540772fa2287e63a0c745229fb72b78903c9cd70':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
Tim Murray [Thu, 11 Jun 2015 23:00:47 +0000 (16:00 -0700)]
Add support for cortex-a53 variants when building 64-bit.
Change-Id: I3f1fb5dbde731d9c3d6db26a46bc7f0f54d8e071
Tao Bao [Wed, 10 Jun 2015 23:08:45 +0000 (23:08 +0000)]
Merge "Support SELinux context label when mounting" into mnc-dev
OSDN Git Service
