OSDN Git Service
Tao Bao [Fri, 10 Jul 2015 20:51:34 +0000 (20:51 +0000)]
Merge "Zero out blocks that may be touched by dm-verity."
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: Id097138bfd065c84eac088b3ad49758010b2927b
(cherry picked from commit
2fd2c9bfd6c9beeaeccb4632b785227fe56c6006)
Elliott Hughes [Thu, 9 Jul 2015 17:30:16 +0000 (17:30 +0000)]
Merge "Remove HAVE_WIN32_IPC."
Elliott Hughes [Thu, 9 Jul 2015 17:20:13 +0000 (10:20 -0700)]
Remove HAVE_WIN32_IPC.
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
Elliott Hughes [Wed, 8 Jul 2015 23:13:31 +0000 (23:13 +0000)]
Merge "Remove mkbootimg from the pathmap."
Elliott Hughes [Wed, 8 Jul 2015 23:11:17 +0000 (23:11 +0000)]
Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
Elliott Hughes [Wed, 8 Jul 2015 23:05:17 +0000 (16:05 -0700)]
Remove mkbootimg from the pathmap.
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)
Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
Elliott Hughes [Wed, 8 Jul 2015 21:19:59 +0000 (21:19 +0000)]
Merge "Remove pathmap.mk entries for libc."
Elliott Hughes [Wed, 8 Jul 2015 20:13:37 +0000 (13:13 -0700)]
Remove pathmap.mk entries for libc.
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
Elliott Hughes [Wed, 8 Jul 2015 20:12:38 +0000 (13:12 -0700)]
Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
Tao Bao [Wed, 8 Jul 2015 17:22:35 +0000 (17:22 +0000)]
Merge "Scan all init.*.rc files for flash_recovery service."
Tao Bao [Wed, 8 Jul 2015 01:31:47 +0000 (18:31 -0700)]
Scan all init.*.rc files for flash_recovery service.
Clockwork builds may rename init.rc to init.core.rc. Change the OTA
script to scan all init.*.rc files to determine the proper location for
install-recovery.sh.
Bug:
22128990
Change-Id: Icad3497d1663e074b938919b40fc239c84fbeb2b
(cherry picked from commit
610754e5ad84b2e65358d85dd38a4e0c86dc9342)
Tao Bao [Tue, 7 Jul 2015 16:48:50 +0000 (16:48 +0000)]
Merge "fix up ota_from_target_files symlink detection."
Ying Wang [Mon, 6 Jul 2015 21:02:01 +0000 (14:02 -0700)]
fix up ota_from_target_files symlink detection.
Change-Id: I10b668096d4e61e75473dd805f96387049f29b79
Tao Bao [Mon, 6 Jul 2015 16:31:50 +0000 (16:31 +0000)]
Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
Tao Bao [Mon, 6 Jul 2015 04:08:33 +0000 (21:08 -0700)]
Fix OTA scripts to generate incremental BBOTA with OEM property.
Bug:
21803136
Change-Id: I3a45e8aea0b4f4f4f2acb4c9c8a7fad7a014680c
Ying Wang [Thu, 2 Jul 2015 22:59:37 +0000 (22:59 +0000)]
Merge "Simplify LOCAL_NO_CRT."
Ying Wang [Thu, 2 Jul 2015 22:57:45 +0000 (15:57 -0700)]
Simplify LOCAL_NO_CRT.
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
Elliott Hughes [Thu, 2 Jul 2015 18:50:25 +0000 (18:50 +0000)]
Merge "Remove HAVE_STDINT_H namespace pollution."
Stephen Hines [Thu, 2 Jul 2015 18:38:31 +0000 (18:38 +0000)]
Merge "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
Elliott Hughes [Thu, 2 Jul 2015 17:26:53 +0000 (10:26 -0700)]
Remove HAVE_STDINT_H namespace pollution.
Change-Id: I1e42d1616da0f3a90f8da189d2e919f781c4eb5a
Ying Wang [Wed, 1 Jul 2015 18:58:51 +0000 (18:58 +0000)]
Merge "Configure synci generation explicitly"
Evgenii Stepanov [Tue, 30 Jun 2015 21:30:29 +0000 (21:30 +0000)]
Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
Evgenii Stepanov [Tue, 30 Jun 2015 21:02:02 +0000 (14:02 -0700)]
Move sanitized vendor libraries to /data/vendor/lib(|64).
Sanitized RPATH now mentions /system/vendor/lib to preserve overlay
in the case when a sanitized version of a vendor library can not be
built.
Bug:
22199458
Change-Id: I3222d2e1d6c08fdd1e0404fcb7db347aa4a92bb7
Tao Bao [Tue, 30 Jun 2015 19:19:40 +0000 (19:19 +0000)]
Merge "Retry adjusting the size computation for reserved blocks."
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: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit
c7a6f1e4f8ff504bf617a0415b2c43ab3d339294)
Tao Bao [Sat, 27 Jun 2015 16:37:39 +0000 (16:37 +0000)]
Merge "sparse_img.py: Don't write empty map groups."
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
Tao Bao [Fri, 26 Jun 2015 22:57:08 +0000 (22:57 +0000)]
Merge "Use fstab in the source build"
Tao Bao [Fri, 26 Jun 2015 22:56:57 +0000 (22:56 +0000)]
Merge "Support SELinux context label when mounting"
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: Ia02584c71af7d47835b1f62e7daa46f27940a545
(cherry picked from commit
bebd3cfbf934beb18b73a4d4e98b98c2c0a1d6fe)
Evgenii Stepanov [Fri, 26 Jun 2015 20:57:46 +0000 (20:57 +0000)]
Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries."
Evgenii Stepanov [Thu, 25 Jun 2015 23:38:25 +0000 (16:38 -0700)]
SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
These symbols are defined in the ASan runtime library, which is always
present at runtime.
Bug:
21785137
Change-Id: Ib8418c66323fd4cdfdc05548048f32380cb84ee5
Ying Wang [Thu, 25 Jun 2015 21:29:48 +0000 (21:29 +0000)]
Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
Ying Wang [Thu, 25 Jun 2015 20:56:53 +0000 (13:56 -0700)]
Create userdata.img with real data when SANITIZE_TARGET=address.
Bug:
21785137
Change-Id: Ie0c36988759fe07419ad29bab5a71cdd0d992d2a
Mohamad Ayyash [Thu, 25 Jun 2015 18:44:02 +0000 (18:44 +0000)]
Merge "Add img2simg in host and ota packages"
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:01:00 +0000 (22:01 +0000)]
Merge "build_image.py: Make sparse squashfs images"
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>
Tao Bao [Wed, 24 Jun 2015 00:50:41 +0000 (00:50 +0000)]
Merge "Fix the error in sparse_img.py"
Tao Bao [Wed, 24 Jun 2015 00:30:35 +0000 (17:30 -0700)]
Fix the error in sparse_img.py
Bug:
22046423
Change-Id: I0796e14df2b523570f0c485d146273f5e5aa5494
(cherry picked from commit
2b4ff174ff09d3d4f69897c8f8004c57836975b4)
Ying Wang [Tue, 23 Jun 2015 19:59:56 +0000 (19:59 +0000)]
Merge "Don't include static executables when SANITIZE_TARGET=address"
Elliott Hughes [Tue, 23 Jun 2015 19:29:26 +0000 (19:29 +0000)]
Merge "Revert "Hide unwinder symbols in each binary.""
Bart Sears [Tue, 23 Jun 2015 19:23:13 +0000 (19:23 +0000)]
Revert "Hide unwinder symbols in each binary."
This reverts commit
dc30a16ba27c4a0de388696869cd1c518ecb3f3a.
Change-Id: Ib6af148bcaa3041b3040e525442a39b493852794
Dan Albert [Tue, 23 Jun 2015 18:00:36 +0000 (18:00 +0000)]
Merge "Hide unwinder symbols in each binary."
Ying Wang [Tue, 23 Jun 2015 01:35:35 +0000 (18:35 -0700)]
Don't include static executables when SANITIZE_TARGET=address
Also we can't build the ota package without these static executables.
Bug:
21785137
Change-Id: I11b35abebced4b0608378a072ece2ab2dbadeffb
Ying Wang [Tue, 23 Jun 2015 16:57:30 +0000 (16:57 +0000)]
Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules"
Claes Elgemark [Thu, 11 Jun 2015 06:22:38 +0000 (08:22 +0200)]
Add variable ANDROID_NO_TEST_CHECK to not build all test modules
Introduce a way to speed up local builds. Don't build all test
modules if ANDROID_NO_TEST_CHECK is set to true.
On master branch this reduces what is built by more than
300 apps and 50 java libraries. Time for doing this on a
12 core machine running with -j13 is about 10 minutes.
Change-Id: I90feb108695ee60d0dbbf497644f767cc3748215
Bo Hu [Tue, 23 Jun 2015 06:37:53 +0000 (06:37 +0000)]
Merge "Add android.hardware.ethernet.xml for ranchu targets"
Dan Albert [Tue, 31 Mar 2015 23:47:09 +0000 (16:47 -0700)]
Hide unwinder symbols in each binary.
These symbols need to always be resolved for each binary. Making these
symbols hidden means that we will get a build breakage if this doesn't
happen, and should also prevent the situation where one unwinder's
symbols are visible to the other.
Bug:
18471342
Bug:
19958712
Change-Id: Ieff1f10dab254b60ed120410f45998cf75bb5b9b
Evgenii Stepanov [Fri, 19 Jun 2015 21:05:40 +0000 (21:05 +0000)]
Merge "Clean intermediate files if SANITIZE_TARGET has changed."
Evgenii Stepanov [Fri, 19 Jun 2015 21:05:31 +0000 (21:05 +0000)]
Merge "With SANITIZE_TARGET, move shared libraries to /data."
Evgenii Stepanov [Fri, 12 Jun 2015 00:36:06 +0000 (17:36 -0700)]
Clean intermediate files if SANITIZE_TARGET has changed.
Do not clean installed files, only intermediate files. This way, two
consequitive builds first without, then with SANITIZE_TARGET will
produce a frankenbuild with both sets of shared libraries.
Bug:
21785137
Change-Id: I231868b15331be942c783458cf36233c2e7740d3
Evgenii Stepanov [Fri, 12 Jun 2015 00:32:31 +0000 (17:32 -0700)]
With SANITIZE_TARGET, move shared libraries to /data.
A fully (or even mostly) asan-instrumented device will have 2 copies of each
shared library, which might not fit on system partition. Moving instrumented
libraries to /data.
Bug:
21785137
Change-Id: I64184261da2eb24a1382c67e4931c34a5a38b3c0
Evgenii Stepanov [Fri, 19 Jun 2015 18:15:07 +0000 (18:15 +0000)]
Merge "Enable SANITIZE_TARGET."
Dan Albert [Fri, 19 Jun 2015 17:51:10 +0000 (17:51 +0000)]
Merge "Add support for `LOCAL_SANITIZE := integer`."
Dan Albert [Wed, 17 Jun 2015 06:27:34 +0000 (23:27 -0700)]
Add support for `LOCAL_SANITIZE := integer`.
This also does a bit of cleanup in config_sanitizers.mk. The result is
that `LOCAL_SANITIZE := <any arbitrary ubsan group>` should function
fine for both host and target.
This is a superset of LOCAL_DETECT_INTEGER_OVERFLOWS, so remove that.
This also checks integer division by zero. It's supposed to cover
shifting undefined behaviors as well, but apparently it does not
(though `LOCAL_SANITIZE := shift` works fine).
Change-Id: I4ac99eafa6920a3f8cb82af37ce56ff0fdb95223
Dan Albert [Fri, 19 Jun 2015 17:27:41 +0000 (17:27 +0000)]
Merge "Cleanup unused clear_vars.mk entry."
Dan Albert [Fri, 19 Jun 2015 17:24:07 +0000 (10:24 -0700)]
Cleanup unused clear_vars.mk entry.
Change-Id: Ibd7b87d1364a60289609a267a287c4afa1d5e5cb
Miroslav Tisma [Mon, 15 Jun 2015 13:53:39 +0000 (15:53 +0200)]
Add android.hardware.ethernet.xml for ranchu targets
This commit adds android.hardware.ethernet.xml file for ethernet
permission to PRODUCT_COPY_FILES which will be copied to
/system/etc/permission folder on the target. Reason for adding
this permission file is for enabling the ethernet and having
functional networking until RIL backend support in ranchu is
implemented.
This requires dhcpcd_eth0 service definition in init.ranchu.rc.
Architectures that use goldfish emulator do not need ethernet
support, because networking is provided by RIL.
Change-Id: I7972f80cf78c0fdecf3fde45bf018230bbcefd38
Evgenii Stepanov [Thu, 11 Jun 2015 20:57:10 +0000 (13:57 -0700)]
Enable SANITIZE_TARGET.
The same as SANITIZE_HOST, but for the target.
Also, skip all LOCAL_FORCE_STATIC_EXECUTABLE targets, as ASan does not
support static linking.
Bug:
21785137
Change-Id: Ief53ff8de1fee18f230d6c7dd31845db5bbd415c
Ying Wang [Wed, 17 Jun 2015 21:18:47 +0000 (21:18 +0000)]
Merge "Really include drawables for all densities."
Ying Wang [Fri, 12 Jun 2015 17:33:59 +0000 (10:33 -0700)]
Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug:
21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
Dan Albert [Wed, 17 Jun 2015 17:21:26 +0000 (17:21 +0000)]
Merge "Remove LOCAL_ADDRESS_SANITIZER."
Dan Albert [Wed, 17 Jun 2015 17:19:24 +0000 (17:19 +0000)]
Merge "Stop disallowing sanitizers."
Elliott Hughes [Wed, 17 Jun 2015 17:02:52 +0000 (17:02 +0000)]
Merge "Revert "[MIPS] Do not use compact branches until GDB supports them""
Nikola Veljkovic [Wed, 17 Jun 2015 15:22:26 +0000 (17:22 +0200)]
Revert "[MIPS] Do not use compact branches until GDB supports them"
This reverts commit
063ef3308992ce67c9a72c351978c3b7d2346e94.
Dan Albert [Tue, 16 Jun 2015 23:04:01 +0000 (16:04 -0700)]
Remove LOCAL_ADDRESS_SANITIZER.
I've migrated all users of this to the new option now, so we can drop
this.
Dropping `SANITIZE_HOST := true` will have to wait until the build
server configs have been updated.
Change-Id: I591436e197a6c6c079a6cd6a2decb702b574cd71
Dan Albert [Tue, 16 Jun 2015 21:14:43 +0000 (14:14 -0700)]
Stop disallowing sanitizers.
Change-Id: I641cb3fe998184f8926324e3365a7a99d87263df
Elliott Hughes [Tue, 16 Jun 2015 22:32:28 +0000 (22:32 +0000)]
Merge "Remove copy & paste cruft from the mips64 combo."
Elliott Hughes [Tue, 16 Jun 2015 22:22:52 +0000 (15:22 -0700)]
Remove copy & paste cruft from the mips64 combo.
libthread_db hasn't been in bionic for years.
Change-Id: Ibc036d894c6b6bf9ee4653f95ff7a000a223cb2e
Dan Albert [Tue, 16 Jun 2015 21:12:22 +0000 (21:12 +0000)]
Merge "Fix libdl inclusion for default-ub."
Nick Kralevich [Mon, 15 Jun 2015 21:54:30 +0000 (21:54 +0000)]
Merge "Add support for LOCAL_DETECT_INTEGER_OVERFLOWS"
Nick Kralevich [Sun, 14 Jun 2015 18:38:30 +0000 (11:38 -0700)]
Add support for LOCAL_DETECT_INTEGER_OVERFLOWS
Add build system support for LOCAL_DETECT_INTEGER_OVERFLOWS. When enabled,
an attempt to perform an integer arithmetic operation which overflows
will result in a call to abort(). This is intended for security
sensitive code, where integer overflow operations are not expected
nor desirable.
Two classes of underflows/overflows are detected and blocked:
1) Signed integer underflow/overflow.
2) Unsigned integer underflow/overflows.
Signed integer overflows are undefined behavior, according to the
C standard. Unsigned integer overflows are defined behavior, but
still undesirable in security sensitive code.
Only clang is supported today. gcc has -ftrapv for handling signed
integer overflow, but it's widely considered broken
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=35412) and we're
deliberately avoiding it's use here.
Change-Id: Ib4918dc84e37e83d4205e5035544545d91671e5f
Vaguely-Related-Bug:
11859726
Dan Albert [Mon, 15 Jun 2015 18:39:29 +0000 (11:39 -0700)]
Fix libdl inclusion for default-ub.
We shouldn't be using ldlibs for target libraries because it doesn't
add a real dependency.
Change-Id: Ib1ec40b95356feb521e95674b64d04d5ecc06332
Dan Albert [Fri, 12 Jun 2015 19:52:19 +0000 (19:52 +0000)]
Merge "Force some clang Werrors that *will* break things."
Jeff Vander Stoep [Fri, 12 Jun 2015 17:37:24 +0000 (17:37 +0000)]
Merge "selinux: add tools to dev path"
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.
Bug:
21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
Dan Albert [Wed, 10 Jun 2015 23:33:43 +0000 (16:33 -0700)]
Force some clang Werrors that *will* break things.
Clang is really aggressive at optimizing a handful of cases (read:
clang will ruin your day some if you write bad code). Fortunately, it
also emits a warning when it's about to do this.
To prevent anyone from suffering from these optimizations, make these
warnings errors and make them impossible to disable.
Change-Id: I5e10bb0fc2ca23190017da716b3b84635577a0bd
Tao Bao [Wed, 10 Jun 2015 19:32:41 +0000 (12:32 -0700)]
Support SELinux context label when mounting
If there is a SELinux context label in the recovery.fstab, we should
honor that when mounting the partition.
Bug:
19764039
Change-Id: Ic80a3377a5a94c9d10dd464eb1257b157a947510
(cherry picked from commit
548eb76c8f0e18d114ce4125905434c1c6920969)
Ying Wang [Tue, 9 Jun 2015 16:20:49 +0000 (16:20 +0000)]
Merge "Add build_verity_metadata.py to dist-tools"
Narayan Kamath [Tue, 9 Jun 2015 10:03:16 +0000 (10:03 +0000)]
Merge "Remove duplicate CTS tests from libcore cts packages."
Narayan Kamath [Mon, 1 Jun 2015 13:45:55 +0000 (14:45 +0100)]
Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.
Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.
bug:
20862863
(cherry picked from commit
cf7fbcd03d9f13d1c2fe6e65f02247feadec136d)
Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8
Mark Salyzyn [Mon, 8 Jun 2015 23:51:32 +0000 (23:51 +0000)]
Merge "Add missing shared libraries to dist tools"
Ying Wang [Mon, 8 Jun 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Strip path from verity_signer_cmd in the target-files meta data."
Ying Wang [Mon, 8 Jun 2015 19:00:59 +0000 (19:00 +0000)]
Merge "Remove the unnecessary full_x86_64 and full_mips64."
Ying Wang [Mon, 8 Jun 2015 18:57:26 +0000 (11:57 -0700)]
Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.
Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
Claes Elgemark [Thu, 4 Jun 2015 08:07:44 +0000 (10:07 +0200)]
Add build_verity_metadata.py to dist-tools
Preserve path as it is referenced by build_image.py.
Change-Id: Id6833d243b5a15b4ee5e0013340aeb2cd35f3578
Claes Elgemark [Wed, 3 Jun 2015 06:35:52 +0000 (08:35 +0200)]
Add missing shared libraries to dist tools
Add missing libraries used by e2fsck and build_verity_tree.
Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
Ying Wang [Wed, 3 Jun 2015 16:59:01 +0000 (16:59 +0000)]
Merge "Add selinux and verity support to custom image generation."
Ying Wang [Wed, 3 Jun 2015 16:58:46 +0000 (16:58 +0000)]
Merge "Support to configure and build multiple custom images."
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
Add selinux and verity support to custom image generation.
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug:
19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit
7d51a4029590b58e22071eed919d59a0ff205bef)
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug:
19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit
5fcf1094f9cf4d57c2598237f99621f254130d71)
Mark Salyzyn [Wed, 3 Jun 2015 16:45:26 +0000 (16:45 +0000)]
Merge "goldfish: rename goldfish_logcat.te to logd.te"
Ying Wang [Wed, 3 Jun 2015 16:42:17 +0000 (16:42 +0000)]
Merge "Add VeritySigner.jar to ota tools"
Claes Elgemark [Tue, 2 Jun 2015 09:59:32 +0000 (11:59 +0200)]
Add VeritySigner.jar to ota tools
Used by verity_signer
Change-Id: I6e2b654144b40573c3f3c0dc0d1c943889ffcd7d
Tao Bao [Wed, 3 Jun 2015 16:30:20 +0000 (16:30 +0000)]
Merge "Fix the wrong error message"
Tao Bao [Wed, 3 Jun 2015 16:24:08 +0000 (09:24 -0700)]
Fix the wrong error message
apply_patch_space() checks the free space on /cache, not /system.
Change-Id: I70996d5cd5a81fe4871ee738bddb1437e8df6fb9
Mark Salyzyn [Wed, 3 Jun 2015 16:00:14 +0000 (09:00 -0700)]
goldfish: rename goldfish_logcat.te to logd.te
Bug:
19608716
Change-Id: I5c76648a4bcbbb15a033465e8af66b12af6e0a18