aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-14Merge "Allow prebuilts to specify mini-debug-info"android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Dan Willemsen
2016-07-13Allow prebuilts to specify mini-debug-infoDan Willemsen
So that Soong can specify the default that's used by Make. Change-Id: I0c1062ad8f21df8b9a483f99dce679a1434e4859
2016-07-13Merge "Fix root_filesystem_config.txt generation"Tao Bao
2016-07-13Merge "Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong"android-wear-n-preview-2Treehugger Robot
2016-07-12Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to SoongDan Willemsen
Change-Id: I75c0d60854f2ea3d2e4e4d6dcbc6845e3b0336ad
2016-07-12Merge "Turn ndk link check warning into error"Treehugger Robot
2016-07-12Turn ndk link check warning into errorDan Willemsen
All instances of this have been removed from the downstream trees. The APK->JNI_SHARED_LIBRARY and Java->Java checks remain as warnings. Change-Id: I3eaee284500deee0f26a4f9cdd96497e99ec533e
2016-07-12Merge "Remove Android.bp logic from makefiles"Colin Cross
2016-07-11Remove Android.bp logic from makefilesColin Cross
When Soong was optional, the make build system needed extra complexity to ignore Android.mk files that had an associated Android.bp file. Now that Soong is required and the Android.mk files that were obsoleted by an associated Android.bp file have been removed, remove all of the logic that found associated Android.bp files. Android.mk files and Android.bp files are now handled independently. Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35
2016-07-11Merge "Extend SDK link check to java libraries"Dan Willemsen
2016-07-11Merge changes from topic 'imgdiff-squashfs'Treehugger Robot
* changes: releasetools: Fix the detection of using squashfs. releasetools: Disable using imgdiff for squashfs.
2016-07-10releasetools: Fix the detection of using squashfs.Tao Bao
We should disable using imgdiff if *any* of the source and target partitions uses squashfs. Bug: 30004734 Test: Create an incremental with two builds with one of them uses squashfs. Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3 (cherry picked from commit f8acad1480a3b4479c7ddfa89df8be946d83d3ed)
2016-07-10releasetools: Disable using imgdiff for squashfs.Tao Bao
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for higher compression ratio. For system/vendor in squashfs, a) all files are compressed in LZ4 format; b) we use 4096-byte block size in their sparse images, but the files in squashfs may not be laid out as 4K-aligned. So the blocks for a given file as listed in block map may not form a valid zip file, which may fail the patch generation with imgdiff. Disable using imgdiff for squashfs images, and use bsdiff instead. Bug: 22322817 Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3 (cherry picked from commit 293fd135c7bc0c21b41f1782d21c26de64e8854a)
2016-07-09Extend SDK link check to java librariesDan Willemsen
Java code using the SDK should not link to java code built with the platform APIs or the system SDK. Java code using the system SDK should not link to the platform APIs either, but it can link to java code using another SDK. Change-Id: Iaae0a7e01993cfa1e023649fbd8a7974b5eca709
2016-07-08Merge "releasetools: Fix the payload public key replacement."Treehugger Robot
2016-07-08releasetools: Fix the payload public key replacement.Tao Bao
update_engine expects the extracted public key instead of the certificate. Bug: 28701652 Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d (cherry picked from commit afaf295cb85eb4091bc8a82950acab618b4139ca)
2016-07-08Fix root_filesystem_config.txt generationGaelle Nassiet
The first line returned by awk is empty. In consequence, when fs_config computes its mode it will consider this line as a file (no trailing slash) and affect the default android_files mode which is 0644. The mode for the root directory should be the default android_dirs mode 0755. Add a special case in fs_config to consider empty line as a directory. Change-Id: I9f33f6fcf4be05c31914db898e65c92b0a611518 Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
2016-07-07Merge "Move apksigner library to tools/apksig."Treehugger Robot
2016-07-07Merge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"Treehugger Robot
2016-07-07Support LOCAL_STRIP_MODULE := keep_symbols for prebuiltsColin Cross
Change-Id: I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2
2016-07-07Merge "Recognize new C/C++ compiler and static analyzer warnings."Treehugger Robot
2016-07-07Move apksigner library to tools/apksig.Alex Klyubin
This moves build/tools/apksigner/core to its own project tools/apksig. The move also renames the moved Java packages from com.android.apksigner.core.* to com.android.apksig.* to reflect the new name of the library. Bug: 27461702 Change-Id: Iab812ae2b8f0a741014f842460c78e35bc249d43
2016-07-07Merge "Never add asan libraries to NDK code"Dan Willemsen
2016-07-06Merge "APK signer primitive."Treehugger Robot
2016-07-06Recognize new C/C++ compiler and static analyzer warnings.Chih-Hung Hsieh
Change-Id: I5f47c45498c640702922704aa5305a85e9493fcc Test: run with Android build.log.
2016-07-01Merge "Apply SANITIZE_TARGET=safe-stack to 64 bit targets only."Evgenii Stepanov
2016-07-01Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.Evgenii Stepanov
Bug: 27729263 Change-Id: I214a9f40b94f6e6716aca05be774f014e62f73e8
2016-07-01Merge "Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present."Evgenii Stepanov
2016-07-01Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.Evgenii Stepanov
The idea is that targets with LOCAL_SANITIZE = signed-integer-overflow and SANITIZE_TARGET=safe-stack should get both sanitizers. This should work just fine for SANITIZE_TARGET=address, too. Bug: 27729263 Change-Id: Ifee350da4877008fb061bc7f6c700e7fade405bc
2016-07-01Merge changes I17a96b97,Ib4412657,I73e6d479Treehugger Robot
* changes: Build: Add module-level product configuration of sanitization Build: Add option to restrict sanitization by owner Build: Add option to restrict sanitization by architecture
2016-07-01Merge "Build: Fix vendor sanitizer library for secondary arch"Treehugger Robot
2016-06-30Build: Fix vendor sanitizer library for secondary archAndreas Gampe
Fix the directory for secondary-architecture libraries under sanitization. These incorrectly wrote into vendor/lib instead of data/vendor/lib. Bug: 29498013 Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
2016-07-01Merge "Sanitizer build tweaks."Evgenii Stepanov
2016-07-01Sanitizer build tweaks.Evgenii Stepanov
-Wl,-no-undefined is currently disabled for any SANITIZE_TARGET. Limit that to the sanitizers with a runtime library (i.e. address, thread). Re-enable the relocation packer for ASan. This has been fixed upstream a long time ago. Bug: 27729263 Change-Id: I566df6104de816223dc1c519d41a87629ce9c47c
2016-06-30Merge "Only add libdl dependency for ASan/TSan on target."Evgenii Stepanov
2016-06-30Only add libdl dependency for ASan/TSan on target.Evgenii Stepanov
Only sanitizers that intercept stuff need that. For example, SafeStack does not, and I think UBSan too. Bug: 27729263 Change-Id: I413cd46cc6c6914a363a3c53da7954beacd8f0d8
2016-06-30Build: Add module-level product configuration of sanitizationAndreas Gampe
To allow special sanitizer settings for modules shared between products, add product-specific module settings. This was copied from the product-specific dexopt settings. Bug: 29498013 Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1 (cherry picked from commit bb5454b6db5770f0b0275424148b2d7d3c52a56d)
2016-06-30Build: Add option to restrict sanitization by ownerAndreas Gampe
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively sanitize modules. By default, both are being sanitized. The value of the variable is interpreted as a space or colon separated list of owner names. This can be used to create builds that lower the sanitization burden by not sanitizing parts of the platform. Bug: 29498013 Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb (cherry picked from commit ea38d8e95d7daea49cc2a528d69e06a0005b31a6)
2016-06-30Build: Add option to restrict sanitization by architectureAndreas Gampe
Add Make variable SANITIZE_ARCH to selectively sanitize binaries. This uses the "bitness," i.e., 32 or 64, to potentially filter the sanitization. By default, both are being sanitized. This can be used to create builds that lower the sanitization burden by not sanitizing "half" of the platform. Bug: 29498013 Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f (cherry picked from commit 0290a416c844f9a8ec953f63f199b00d36283228)
2016-06-30Merge "Add LOCAL_NOSANITIZE."Evgenii Stepanov
2016-06-30Add LOCAL_NOSANITIZE.Evgenii Stepanov
This can be used to selectively disable individual sanitizers on a target. For example, some parts of libc should be built with SafeStack (when requested with SANITIZE_TARGET), but never with AddressSanitizer. Current build rules specify LOCAL_SANITIZE := never to disable AddressSanitizer; the idea is to change that to LOCAL_NOSANITIZE := address thread. Bug: 27729263 Change-Id: I2b770f2ce3faf6ad6798792327e96adb86fe4a4f
2016-06-29Merge "Detect `uname -m` == i686 as a 32-bit host"Treehugger Robot
2016-06-29Detect `uname -m` == i686 as a 32-bit hostDan Willemsen
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932 Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
2016-06-29Merge "Skip copying existing vendor images"Tianjie Xu
2016-06-29Skip copying existing vendor imagesTianjie Xu
add_img_to_target_files.py has an option of "-a" to add missing images only. Under this option, the script should skip copying the radio images for A/B devices when given image exists already under "IMAGES/". Test: Run the command on an A/B device, the existing radio images under "IMAGES/" don't get overwritten; and missing images are added correctly. Bug: 29608905 Change-Id: Ie034b85a5d777d53e367f99470cea4d19cb1aaaf
2016-06-29Merge "Add jdk.net to whitelist"Yi Kong
2016-06-28Never add asan libraries to NDK codeDan Willemsen
We're beginning to enforce (still warning) that NDK code only links to other NDK code. So we should never need to link them to the address sanitizer libraries. This breaks down a bit when platform code starts depending on NDK-built code, where the NDK-built code should be mostly the same as if it was built with the platform, but has an implicit LOCAL_SANITIZE := never. Even so, this change shouldn't make that worse, as we'll still compile fine, and anything platform code that uses asan should pull in the shared library. Change-Id: I81b30b9edd971468c3cb1467f809f184807b505e
2016-06-28Merge "Extract public key ID from cert"Badhri Jagan Sridharan
2016-06-28Extract public key ID from certBadhri Jagan Sridharan
Extracts keyid inline using openssl commands. The keyid is passed as one of the kernel command line parameters for the dm-android-verity module to mount root fs(system) with verity enabled. (cherry-picked from 3af315aed5d657942b28ccae342324b9ee90116d https://googleplex-android-review.git.corp.google.com/#/c/1061691/) BUG: 28384658 Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
2016-06-28Merge "Turn unused source files from warning to error"Treehugger Robot