Tao Bao
8787cd6d4e
resolved conflicts for merge of 7f9470cd
to lmp-mr1-ub-dev
...
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99
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
2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425
Revert "sparse_img.py: Don't write empty map groups."
...
This reverts commit 7f9470cda3
.
Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3
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
2015-07-01 10:10:31 -07:00
dcashman
19eeccdaf2
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
2015-07-01 09:14:18 -07:00
Tao Bao
c7a6f1e4f8
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 efbb5d2e69
.
Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00
Tao Bao
2384d01c1c
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 efbb5d2e69
.
Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Dianne Hackborn
578a9efd83
Merge "Raise API level to 23." into mnc-dev
2015-06-27 00:29:20 +00:00
Ying Wang
95a7311ac5
am 78d1cba0
: (-s ours) Fix conflict resolving error in ef5dc90bba
...
* commit '78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4':
Fix conflict resolving error in ef5dc90bba
2015-06-26 23:06:46 +00:00
Dianne Hackborn
a42551685f
Raise API level to 23.
...
Now apps can target both MNC and 23.
Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00
Ying Wang
78d1cba0f4
Fix conflict resolving error in ef5dc90bba
...
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Ying Wang
742f5832b1
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
2015-06-26 19:37:28 +00:00
Mohamad Ayyash
aae1a0ba48
resolved conflicts for merge of 1a4658cd
to mnc-dev
2015-06-25 17:24:05 -07:00
Mohamad Ayyash
1a4658cd3b
resolved conflicts for merge of ef5dc90b
to lmp-mr1-ub-dev
2015-06-24 16:54:12 -07:00
Mohamad Ayyash
4f177cc6e9
am 48cb24a6
: am 648e40e8
: build_image.py: Make sparse squashfs images
...
* commit '48cb24a655b58c3b2147f120223627a357ad6372':
build_image.py: Make sparse squashfs images
2015-06-24 23:16:18 +00:00
Mohamad Ayyash
07a7590f08
Merge "build_image.py: Make sparse squashfs images" into mnc-dev
2015-06-24 23:15:56 +00:00
Simon Wilson
b7b7aedeb3
Merge "resolved conflicts for merge of ecfc97f7
to mnc-dev" into mnc-dev
2015-06-24 23:14:07 +00:00
Mohamad Ayyash
914811a9f2
Merge "Add img2simg in host and ota packages" into mnc-dev
2015-06-24 23:13:51 +00:00
Mohamad Ayyash
ef5dc90bba
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Simon Wilson
6d5ddc32ab
resolved conflicts for merge of ecfc97f7
to mnc-dev
...
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash
353265b081
Add img2simg in host and ota packages
...
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Mohamad Ayyash
48cb24a655
am 648e40e8
: build_image.py: Make sparse squashfs images
...
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Simon Wilson
ecfc97f772
resolved conflicts for merge of f86e7eea
to lmp-mr1-ub-dev
...
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash
4826dee78d
am 9ca7fa89
: resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
...
* commit '9ca7fa8993bceb97a6256b60742eeda2f699560b':
common.py: Add support for squashfs
2015-06-24 22:26:02 +00:00
Mohamad Ayyash
9ca7fa8993
resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
2015-06-24 15:04:38 -07:00
Adam Powell
30638322e7
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev
2015-06-24 20:32:15 +00:00
Adam Powell
0cf80f3ab8
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
...
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
2015-06-24 13:04:22 -07:00
Mohamad Ayyash
648e40e866
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
fa6c8a9b79
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:44:52 -07:00
Michael Wright
7371a7a5b5
Add hid command to base build
...
Bug: 21662862
Change-Id: I11ed67b8f0efd1232ddfbb6e0a5f4bdbb065397e
2015-06-24 15:55:47 +01:00
Mohamad Ayyash
9ff8a7162b
am f35ed6bd
: resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
...
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
Allow flashing a squashfs system image
2015-06-24 01:38:26 +00:00
Tao Bao
7102f57781
Merge "Adjust the size computation for reserved blocks" into mnc-dev
2015-06-24 00:53:17 +00:00
Tao Bao
2b4ff174ff
Fix the error in sparse_img.py
...
Bug: 22046423
Change-Id: I9c257002c405277557974fadfe27942c38c3cd04
2015-06-23 17:36:10 -07:00
Mohamad Ayyash
f35ed6bd84
resolved conflicts for merge of cade49dd
to lmp-mr1-ub-dev
2015-06-23 16:22:32 -07:00
Tao Bao
efbb5d2e69
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
2015-06-23 14:53:28 -07:00
Tao Bao
bebd3cfbf9
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
2015-06-22 19:27:59 -07:00
Simon Wilson
f86e7eeabc
Add compressor options for squashfs system images
...
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
leozwang
5c91af0d94
Merge "Add BUILD NUMBER into oem image." into mnc-dev
2015-06-22 00:36:06 +00:00
leozwang
92eb5703e5
Add BUILD NUMBER into oem image.
...
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
2015-06-20 21:05:19 -07:00
David Srbecky
1fe4d1ad79
Merge "Pass --no-generate-debug-info to dex2oat." into mnc-dev
2015-06-19 18:26:27 +00:00
David Srbecky
ab13975219
Pass --no-generate-debug-info to dex2oat.
...
The two flags have been merged and renamed in ART.
(cherry picked from commit d8fae9a6a6
)
Bug: 21924613
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
2015-06-19 02:34:58 +01:00
David Friedman
275ed9c5ab
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.
2015-06-17 22:12:06 +00:00
David Friedman
552de126e9
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.
2015-06-17 21:57:47 +00:00
David Friedman
42c752392c
Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
2015-06-17 21:51:07 +00:00
David Friedman
c997cf910b
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
2015-06-17 14:36:05 -07:00
Mohamad Ayyash
1b748051dd
common.py: Add support for squashfs
...
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:18:44 -07:00
Mohamad Ayyash
cade49ddee
Allow flashing a squashfs system image
...
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
Jeff Vander Stoep
5aa6832e6b
selinux: add tools to dev path
...
Adds audit2allow to the path. No build required.
(cherry picked from 5f50f05340
)
Bug: 21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
2015-06-12 20:02:25 +00:00
Tim Murray
b461acdedb
Merge "Add support for cortex-a53 variants when building 64-bit." into mnc-dev
2015-06-12 18:37:11 +00:00
C. Sean Young
6f44670ada
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.
2015-06-12 17:43:46 +00:00