aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-17Merge "Always use non-sanitized library locations for JNI."android-n-iot-preview-4n-iot-preview-4Treehugger Robot
2017-05-17Always use non-sanitized library locations for JNI.Vishwath Mohan
This CL changes the build system to always look for shared JNI libraries at their unsanitized install locations. Bug: 38309771 Test: m -j40 && SANITIZE_TARGET="address" m -j40 Change-Id: Icb9d4f5365def6ea7a780553f455f41d2cb8b8bf
2017-05-17Merge "Add dexdiag tool to images"David Sehr
2017-05-16Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH"Treehugger Robot
2017-05-16Merge "Allows DX alternative Jar."Treehugger Robot
2017-05-16Start deprecating OVERRIDE_BUILT_MODULE_PATHDan Willemsen
We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can directly specify the shared libraries to the linker. So install both into the standard built module path, and declare a copy rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can incrementally move users from the old location to the standard path. Test: m -j Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c Merged-In: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16Allows DX alternative Jar.Alan Leung
Test: m -j20 ANDROID_COMPILE_WITH_JACK=false DX_ALT_JAR=/mnt/m02/dx_alt.jar Change-Id: I6163280101ff973bc8202a82d2fed42cf0ce6209 (cherry picked from commit b147846b67b18e40f555c79befe143e8eda6e4cf)
2017-05-16Merge "Normalize timestamps in host java libraries"Treehugger Robot
2017-05-16Add dexdiag tool to imagesDavid Sehr
Allow on-device analysis of dex memory usage by adding dexdiag to the image. Bug: 38181622 Test: adb shell "dexdiag" Change-Id: I2142b5e42eae8cc01755d0e86c179c2fa86be00c (cherry picked from commit 76f5fe5b635b813db2af34d452a28fe54964e66c)
2017-05-16Normalize timestamps in host java librariesColin Cross
Remove timestamps from jar files in host java libraries to get consistent results between builds to help with build artifact caching. Bug: 38215808 Test: sha1sum desugar.jar && touch Desugar.java && m -j desugar && sha1sum desugar.jar Change-Id: I1ecac9b2b80f673937086686540ab0736259df1b
2017-05-16Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', ↵Dan Willemsen
'soong_ui_clean' * changes: Move auto installclean to soong_ui Move version checking to soong_ui Move clean/clobber to soong_ui Allow disabling of CleanSpec functionality
2017-05-16Merge "Add support for avbtool in custom_images."Sen Jiang
2017-05-15Add support for avbtool in custom_images.Sen Jiang
Set CUSTOM_IMAGE_AVB_ENABLE := true to enable avb, add_hashtree_footer args can be added in CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS. Bug: 38319818 Test: m custom_images Change-Id: Ia452dc5ce8b55bcbd3abba9e965b72e78fd8c104
2017-05-15Move auto installclean to soong_uiDan Willemsen
This way kati doesn't need to keep state for which build got run last, and we have to run kati less often. This was forcing another kati run for an empty out directory, and a kati run (or two) every time you switched products that shared a device. Bug: 35970961 Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools Test: lunch aosp_arm-eng; m -j blueprint_tools; lunch full-eng; m -j blueprint_tools; <repeat> Change-Id: I825a0868fb7059016a940c76244527432e3e7cff
2017-05-15Move version checking to soong_uiDan Willemsen
This removes versions_checked.mk that caused kati to regenerate the ninja file 3 times for a clean out directory. Kati needs to regenerate every time that we write a file that we also read. soong_ui doesn't have this problem. Bug: 35970961 Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools Test: $OUT_DIR/versions_checked.mk no longer exists Change-Id: I14b67dc275ea3daa77a7315c2985dc73d77fd07c
2017-05-15Move clean/clobber to soong_uiDan Willemsen
So that we don't have to load up all the makefile state just to remove the output directory. Starting from a completely empty out directory: kati: 16s soong_ui: 2.0s From a minimal out directory (m -j blueprint_tools): kati: 3.8s soong_ui: 0.4s Test: m -j clean Test: m -j clobber Change-Id: Iec1ce032c7cc7ed102430080e857fc421b66309c
2017-05-15Allow disabling of CleanSpec functionalityDan Willemsen
This is only intended for testing purposes -- so that we can run build system tests and verify that kati only gets run once for each configuration. CleanSpecs necessarily write state that require us to re-run kati twice. Test: export NO_ANDROID_CLEANSPEC=true; rm -rf out; m -j; m -j Change-Id: I635a8d8b6754dff82fbc7f20c500d06d7cf6c4f2
2017-05-15Merge "add dtbo support for ota"Treehugger Robot
2017-05-15Merge "Add c/a/i/u/* to the list of injar filters"Treehugger Robot
2017-05-15Add c/a/i/u/* to the list of injar filtersPaul Duffin
Previous change that moved com.android.internal.util.Predicate to the legacy-android-test JAR caused a proguard build breakage due to duplicate classes in the application and library. This fixes it in the same way as previous issues with junit and android.test classes were resolved by excluding those classes from the application JAR. Bug: 30188076 Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild Change-Id: Ica0089607187f970251ddba339a1f71d4cad80cc
2017-05-13Merge "Add the option to reserve headroom for partition images. This is ↵Treehugger Robot
useful for devices with low disk space with different build variants."
2017-05-12add dtbo support for otaYueyao Zhu
Test: make dist and locally push ota on a device Change-Id: I920b98f20e248b437955b2a963eb69ed2ddb8d45
2017-05-11Merge "Add a script to parse an block-based ota package"Tianjie Xu
2017-05-11Merge "OTA Tools: Handle password encrypted keys"Tao Bao
2017-05-10OTA Tools: Handle password encrypted keysChristian Oder
* Add logic to handle decrypted keys from common.GetKeyPassword in WriteABOTAPackageWithBrilloScript. * Get the keys passwords in main and store them in OPTIONS.key_passwords. This allows accessing them in WriteABOTAPackageWithBrilloScript and SignOutput so it's only required to ask for the password once, while allowing to use decrypted signing keys. Test: ota_from_target_files.py on marlin and angler respectively. Change-Id: I7c9b0198855a4b630c52b8552e904f312f09c4ce
2017-05-10Merge "make: add __clang_analyzer__ to clang-tidy"Treehugger Robot
2017-05-10Merge changes Id0d167e6,I290a02b0Treehugger Robot
* changes: Clean LOCAL_RESOURCE_DIR paths Implement clean-path
2017-05-09Merge "Selectively add _asan flavor suffix."Treehugger Robot
2017-05-09Add a script to parse an block-based ota packageTianjie Xu
The script prints the meta info, new/patch data size. It also simulates the transfer commands and calculates amount of I/O as well as cache needed. We can add the more options to parse system/vendor.map so that we can analyze the location change of files. Bug: 31514709 Test: parse a bullhead incremental/full ota. Change-Id: I70ed4f4c15e595b1851109e9799d44ac4e815c16
2017-05-09Selectively add _asan flavor suffix.Vishwath Mohan
This CL ensures that the _asan suffix is added to the build flavor only when it doesn't already contain _asan (or _asan_coverage). This correctly prevents it from appending an extra _asan to ASAN lunch configs that already include it in the flavor, while allowing sanitized targets for generic configs to behave as they used to. Bug: 38145756 Test: _asan is correctly appended only for lunch configs that don't already specify it in the build flavor. Change-Id: Ia7d9356f717b97d1c64e3237ca31cc507f27734f
2017-05-08Add the option to reserve headroom for partition images.Julius D'souza
This is useful for devices with low disk space with different build variants. Bug: 37469715 Test: Regular image builds successfully, errors occur when the headroom size is greater than available partition space. Change-Id: I526cdd0f84981bbd16e3afcfe1cd7fc43dce98ef
2017-05-08Merge "Pass --force-determinism to prebuilts."Nicolas Geoffray
2017-05-05Clean LOCAL_RESOURCE_DIR pathsDan Willemsen
With LOCAL_USE_AAPT2, resource directories like a/b/../res cause problems, since ninja will canonicalize the path before creating the intermediate resource directory, so it creates <intermediates>/a/res while we give AAPT2 <intermediates>/a/b/../res, which fails to open. Bug: 37716307 Test: Switch LOCAL_USE_AAPT2:=true for TelecommUnitTests, mma Test: lunch aosp_marlin-userdebug; m -j Change-Id: Id0d167e68185a119390e7b7e3c344895e77ca0e3
2017-05-05Implement clean-pathDan Willemsen
We shouldn't give non-clean paths to tools -- if a/b/../file was specified, we can simplify that path to a/file, and not need to create a/b just to make the path name work. The testcases come from golang's filepath.Clean tests, this should be compatible with that implementation. Bug: 37716307 Test: TEST_MAKE_clean_path=true m -j blueprint_tools Change-Id: I290a02b0a1e4a7c2b9255bca3c881589b521c402
2017-05-06Merge "Export OVERRIDE_RS_DRIVER to soong"Treehugger Robot
2017-05-05Merge "releasetools: Add a verbose parameter to common.Run()."Tao Bao
2017-05-05Export OVERRIDE_RS_DRIVER to soongColin Cross
Test: examine RS cflags Change-Id: I0c1cc54f3f7f860895322d2825c7168c93a84ef5
2017-05-04Merge "core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLE"Treehugger Robot
2017-05-04core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLEThierry Strudel
Bug: 37960599 Test: 'make bootimage' works when BOARD_AVB_ENABLE is true Change-Id: I02c2fa16c9df988fbe1e1d6cd13a62278fedea45 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2017-05-04releasetools: Add a verbose parameter to common.Run().Tao Bao
Caller can optionally specify the verbose flag which overrides OPTIONS.verbose. The command line won't be outputed with verbose=False. This is useful for cases that a) those command lines are less useful (but will spam the output otherwise); b) sensitive info is part of the invocation. 'verbose=False' will be consumed by common.Run() only, instead of being passed to subprocess.Popen(). Test: ota_from_target_files.py on a block based OTA. Change-Id: I7d5b4094d756a60f84f89c6a965e7ccc68e435f8
2017-05-04Merge changes Idf48f45f,Id2a72fe7,If83e1df2android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Treehugger Robot
* changes: Build: Disable leak sanitizer for ijar Build: Disable leak sanitizer for llvm-rs-cc Build: Disable leak sanitizer for aapt
2017-05-03make: add __clang_analyzer__ to clang-tidyGeorge Burgess IV
We have code that acts slightly differently when the static analyzer is running, so that it can produce more accurate diagnostics (e.g. less false positives). It uses __clang_analyzer__ to detect the static analyzer. When the static analyzer is run via clang-tidy, __clang_analyzer__ doesn't get defined. Bug: None Test: WITH_TIDY=1 m. clang-tidy now acts as expected in code made for the static analyzer Change-Id: Ib2a815c0bd67553af465b64207bb480fb52cfaf8
2017-05-03Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested"Treehugger Robot
2017-05-03Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false"Colin Cross
2017-05-03Only set TARGET_PLATFORM version in lunch when explicitly requestedColin Cross
Setting TARGET_PLATFORM_VERSION to DEFAULT_PLATFORM_VERSION during "lunch sailfish-userdebug" causes unnecessary pain when DEFAULT_PLATFORM_VERSION becomes invalid after branching. Only set TARGET_PLATFORM_VERSION if it was explicitly requested with lunch sailfish-userdebug-OPR1. Test: build/make/tests/envsetup_tests.sh Bug: 34972208 Bug: 37208937 Change-Id: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2 Merged-In: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
2017-05-03Merge "Sort inputs to compatibility suite zip files"Treehugger Robot
2017-05-02Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=falseColin Cross
CL I2189055aac9deccc36b8eab8e949796dddadf7a1 moved the ANDROID_COMPILE_WITH_JACK=false check to configure_local_jack.mk, which broke some modules that use ifndef LOCAL_JACK_ENABLED to change their behavior we jack is disabled. Clear DEFAULT_JACK_ENABLED when ANDROID_COMPILE_WITH_JACK=false so that LOCAL_JACK_ENABLED is cleared. Bug: 37483961 Test: m -j checkbuild Change-Id: I0d08946c57182689624c57f4952d7cecaa0b82b3
2017-05-03Merge "Exempt UBSAN runtime library from soong_to_convert"Treehugger Robot
2017-05-02Sort inputs to compatibility suite zip filesColin Cross
Sort the inputs to remove duplicates, which fixes: found two file paths to be copied into dest path: "target/testcases/minikin_perftests/minikin_perftests", both ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests" and ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests"! Test: m -j device-tests Change-Id: I8d7e83cd077c62461c9a08e7f1b49c321fbcb0e3
2017-05-02Merge "Add the missing dependency on payload generation script."Tao Bao