aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-15Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵temp_b_132622481_stage-aosp-masterTreeHugger Robot
stage-aosp-master" into stage-aosp-master
2019-05-15Merge "Generate VNDK snapshot with Soong except configs"Inseob Kim
am: 85fba4c04a Change-Id: I057fb93ae10681de29d9fc4ed673948e23d15da5
2019-05-15Merge "Generate VNDK snapshot with Soong except configs"Treehugger Robot
2019-05-15Merge "Add libc_malloc_{debug,hooks}.so to the absence check."Martin Stjernholm
am: e51a7282b5 Change-Id: I4365afa4b029259d67528a333262137237524fce
2019-05-15Merge "Make implicit 32-bit apps on 64-bit target an error"Anton Hansson
am: 3163453d0a Change-Id: Icfcf1f7995f0b285966564091851bce7483aae5e
2019-05-15Merge "Add libc_malloc_{debug,hooks}.so to the absence check."Treehugger Robot
2019-05-15Merge "Make implicit 32-bit apps on 64-bit target an error"Anton Hansson
2019-05-15Merge "Move default setting of a product variable"Anton Hansson
am: b35b427769 Change-Id: I675888e4cf197bdb1c9436b7f9cc9059a741a892
2019-05-15Merge "Move default setting of a product variable"Anton Hansson
2019-05-14Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag""Andrew Lehmer
am: 4c151cc398 Change-Id: Ia55861c50ef99bdddf784850934dbc648ef3b788
2019-05-14Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag""Andrew Lehmer
2019-05-14Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag"Andrew Lehmer
This reverts commit 79c61ba50ef3d336874504db00289616d80bd8d2. Reason for revert: Buildcop Change-Id: I18d3ebeded2e9b20fef3a57c8509a2e701f6692e
2019-05-14Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag"Mikhail Naganov
am: 9f40efc5ff Change-Id: Ia3f82b87eb3e9f7688203f81b17abba41aac0129
2019-05-14Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag"Treehugger Robot
2019-05-14Add libc_malloc_{debug,hooks}.so to the absence check.Martin Stjernholm
They should only be in the Runtime APEX, c.f. discussion on http://r.android.com/957159. Test: build/soong/build_test.bash through Forrest Bug: 124293228 Change-Id: I33e97a56e67c3f4734d14f38e0f1597b697a2604
2019-05-14Merge "Make PRODUCT_CHARACTERISTICS a single-valued variable"Anton Hansson
am: 87c470e127 Change-Id: Ifc10ee58b9d0301c9dea586d3f410a99a15f3f90
2019-05-14Merge "Make PRODUCT_CHARACTERISTICS a single-valued variable"Anton Hansson
2019-05-14Move default setting of a product variableAnton Hansson
Should be in product_config.mk, before the variables are readonly'd, or the default will fail to work. Bug: 131576555 Test: set PRODUCT_SHIPPING_API_LEVEL := 29 in mainline_arm64.mk && lunch Change-Id: I25faee7ec0a3fff17e1d08b834d868834effda36
2019-05-14Generate VNDK snapshot with Soong except configsInseob Kim
This is the first commit to generate VNDK snapshot with Soong: .so files, some txt files, and notice files are captured with Soong. As ld.config.txt is currently in Android.mk and will be deprecated soon, configs files (and zipping all of artifacts) are still handled with Makefile. Bug: 131564934 Test: 1) DIST_DIR=out/dist development/vndk/snapshot/build.sh Test: 2) try installing vndk snapshot with: development/vndk/snapshot/update.py Change-Id: Ia904e8a1b44824d6c9556ada93bf1616620a1363
2019-05-13Merge "Add sign_apex.py that signs a given APEX file."Tao Bao
am: bc7e3f98f4 Change-Id: I01b3f3d21fb4f57f2a4ee1503406f96eb15988d1
2019-05-13DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵Xin Li
stage-aosp-master Bug: 132622481 Change-Id: Ide25ddcfa9a928b3affff72c2ce20e77865bd7d5
2019-05-13Merge "Add sign_apex.py that signs a given APEX file."Tao Bao
2019-05-13Remove USE_XML_AUDIO_POLICY_CONF build flagMikhail Naganov
This flag is no more used by the build files and should be removed. Bug: 132435217 Test: make Change-Id: Icbd2359da659290ce4fba1a11ba6da76f23679da
2019-05-13Add sign_apex.py that signs a given APEX file.Tao Bao
This CL moves SignApex() from sign_target_files_apks into apex_utils, and adds sign_apex that allows signing a standalone APEX file directly. Test: Run the following command and check the output file. $ build/make/tools/releasetools/sign_apex.py \ -v \ --container_key \ build/make/target/product/security/testkey.x509.pem \ --payload_key external/avb/test/data/testkey_rsa4096.pem \ --payload_extra_args \ "--signing_helper_with_files ./signing-helper.sh" \ foo.apex \ signed-foo.apex Test: Run sign_target_files_apks.py on crosshatch target_files.zip. Change-Id: I4b2422fd5cb1c60a3aa94511475e2a0e5b1666ca
2019-05-13Make PRODUCT_CHARACTERISTICS a single-valued variableAnton Hansson
Values should be comma-separated, and things won't go down well if there are multiple words in this variable. Bug: 123783710 Test: Put this in product_config.mk and ran multiproduct_kati: ifneq (1,$(words $(PRODUCT_CHARACTERISTICS))) $(error oops) endif Change-Id: I5627f416093d68d8d19916a914739686b74d392f
2019-05-13Merge "Whitelist javax.annotation.processing for inclusion in core-oj."Pete Gillin
am: 738b9963d5 Change-Id: I3106fdfcf7bec4d7e4641cd655fceca19775f0a7
2019-05-13Merge "Whitelist javax.annotation.processing for inclusion in core-oj."Pete Gillin
2019-05-13Make implicit 32-bit apps on 64-bit target an errorAnton Hansson
This has been a warning for a long time. Make it an error instead. Once this has been verified to not cause any problems, it can likely be changed to instead default to setting TARGET_SUPPORTS_64_BIT_APPS := true. Test: build_test Change-Id: I0d03fed2085009c64880a594d5a3aadf72187e60
2019-05-10Merge "Use a copy of dexpreopt.config"Colin Cross
am: 976dd58b34 Change-Id: I4c3f6ea7e55f6e09d054bb4aa797d407b9bc1822
2019-05-11Merge "Use a copy of dexpreopt.config"Colin Cross
2019-05-10Merge "releasetools: Unzip all files when generating image archive."Tao Bao
am: e77dbd2a62 Change-Id: Ibd6965c0b9517fe24e6f3267dc55700f3f320d18
2019-05-11Merge "releasetools: Unzip all files when generating image archive."Tao Bao
2019-05-10releasetools: Unzip all files when generating image archive.Tao Bao
Commit 7df64c3e starts to call common.LoadInfoDict() when generating image archive, which reads additional files under BOOT/, RECOVERY/ and ROOT/. Unzip everything from the target_files.zip. Bug: 132456827 Test: Run img_from_target_files.py on previously failing target_files.zip. Change-Id: I22ee57c4f765bee9494478bf115b1581877401f4
2019-05-10Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."Pete Gillin
am: aa448d138b Change-Id: I12ef0a12aea45a9782105ff3324d8f9c773a1817
2019-05-10Whitelist javax.annotation.processing for inclusion in core-oj.Pete Gillin
Bug: 123891440 Test: EXPERIMENTAL_USE_OPENJDK9=true make droid (cherry picked from commit ec99530de3c31e8a060753c0f82884fff5368f5a) Merged-In: I0fc7a6841f34361883785479671f4422d720ce00 Change-Id: I70dbb89ca29ec1bb47ea5a1cf27b324d354aca11
2019-05-10Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."Pete Gillin
2019-05-10Merge "Filter out .native_bridge static libs from NOTICE files"Dimitry Ivanov
am: 62ae23267f Change-Id: I306ab34b9b0a196195ce5d9abb34de4354dccf0e
2019-05-10Merge "Filter out .native_bridge static libs from NOTICE files"Dimitry Ivanov
2019-05-09Use a copy of dexpreopt.configColin Cross
Move the dexpreopt.config passed to Soong to out/soong/dexpreopt.config and let it write a new copy in a rule and pass the path back to make as DEX_PREOPT_CONFIG_FOR_MAKE. Bug: 132379813 Test: m checkbuild Change-Id: Iac29beac3af8864d36d1563ce42bed11b685548d
2019-05-09[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li
am: 8a39705283 -s ours am skip reason: subject contains skip directive Change-Id: Icaca821460cf80ee26fe0c74f84693e18a89701a
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
am: 8ba7af7849 -s ours am skip reason: subject contains skip directive Change-Id: Ie9d5142fca1dc385ee0774cfa4e1e5f24ff92f60
2019-05-09Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li
2019-05-09Merge "Remove libc_malloc_{debug,hooks} from the system image."Martin Stjernholm
am: eba4d2312a Change-Id: I423c0d2928ed3f62b74d8425450b051913d654ac
2019-05-09Merge "Fixes typo when calling process_dynamic_partitions_info_txt."Daniel Norman
am: 74d91295fd Change-Id: I9c706c816308966d27482f949abcf3cd83082aca
2019-05-09Merge "Remove libc_malloc_{debug,hooks} from the system image."Treehugger Robot
2019-05-09Merge "Fixes typo when calling process_dynamic_partitions_info_txt."Treehugger Robot
2019-05-09DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
Bug: 131756210 Change-Id: I6381f0300194fbe153b951eb30c5228b75de90c5
2019-05-09Filter out .native_bridge static libs from NOTICE filesdimitry
LOCAL_STATIC_LIBRARIES may contain .native_bridge suffix when built for translated targets. This CL makes the NOTICE file exception apply for them too. Bug: http://b/77159578 Test: make Change-Id: Ic8a18f06afa0c460751f21587b7f751ac0ae4a3f
2019-05-09Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.Pete Gillin
The current EXPERIMENTAL_USE_OPENJDK9 environment variable is a legacy from when the 8 -> 9 toolchain upgrade was happening. That migration is done and the variable only affects the language level, so it should have a name that reflects that. (The current situation would be especially confusing if we started a 9 -> 11 toolchain upgrade, presumably controlled by a variable like EXPERIMENTAL_USE_OPENJDK11, since the two settings look incompatible but are actually orthogonal.) The current variable historically allowed a value or "1.8" which meant "use the OpenJDK 9 toolchain but target language level 8". That value no longer has any meaning and the new variable doesn't allow it. Bug: 131678633 Test: `make` with `EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true` Test: `javap -v $OUT_DIR/soong/.intermediates/libcore/core-oj/android_common/javac/classes/java/util/List.class | grep 'major version'` shows 53 Change-Id: Ic1f76a656bea30713b356a28e82f908a46933893 Test: Audit all mentions of the old string here and downstream
2019-05-09Merge "Extend library absence check to Bionic libs and all ART debug libs."Martin Stjernholm
am: f26bef86ec Change-Id: Ia4fd7c2eda96b16401c88052067400e2259c6ddf
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 01:14:19 +0000