aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-08Snap for 7132927 from cfb84402175e784e86cb5308fdee65234222d3de to ↵android-mainline-11.0.0_r44android11-mainline-os-statsd-releaseandroid-build-team Robot
mainline-os-statsd-release Change-Id: I59df12d8fc2c42dac1524f7a80454fcc3132943c
2021-02-02Add Wifi module allowed depsDavid Su
Bug: 178711289 Test: compiles Change-Id: I8bcbf79e99ce1dcfe2d7c982572f26b423f12f71 Merged-In: I8bcbf79e99ce1dcfe2d7c982572f26b423f12f71
2021-01-29Update allowed_deps minSdkversion for netd_aidl_interfaceDavid Su
Bug: 178711289 Test: m Change-Id: I2d60a5c1746b8f77a5c3bcef37d09533108ff203 Merged-In: Id78bb6f8f6ea48435f66528b0c2f915d1ba2b0b3
2021-01-26Automated NDK API coverage backed by Mainline modules build integration.sophiez
Add gen_ndk_backedby_apex.sh script to generate NDK API list used by Mainlain modules when modules get build. Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only Change-Id: Ib1b2f0dd2f9ae85b1545c6cc5bb4c5bbdfac1c15 Merged-In: Ib1b2f0dd2f9ae85b1545c6cc5bb4c5bbdfac1c15
2021-01-13Snap for 7080740 from 60cf3e24d2689795bbd62caa20c0ded80bf039c7 to ↵android-build-team Robot
mainline-os-statsd-release Change-Id: I5116498ed319e3096f216479cc015c4af02135b0
2021-01-07Allowlist sdkextensions proto libAnton Hansson
This is safe for apex use. Bug: 173188089 Test: m apex-allowed-deps-check Merged-In: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad Change-Id: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad (cherry picked from commit 17b1dd80cf7cf30686431320bf00054f3290b747)
2020-12-31Allow-list libderive_sdkAnton Hansson
This is an apex-safe library. Bug: 176574970 Bug: 173188089 Test: m apex-allowed-deps-check Change-Id: Ia789ca673a43339c95551dc6fbff1c4ca8e2ec16 (cherry picked from commit a899365faff54afc352114ca4c51fccf634d75d8)
2020-12-30Add native modules build utils to allow listAnton Hansson
This is a backward-compatible library. Test: m with dep Merged-In: Id68a00efe8973e7660ce2e53d42b7741c9f22a5c Change-Id: Id68a00efe8973e7660ce2e53d42b7741c9f22a5c (cherry picked from commit 1e1e8238955e61274415bdcc74915fac4f5aa7e8)
2020-12-17apex/allowed_deps: add libnetjniutilsOrion Hodson
Bug: 158749603 Test: m Change-Id: I00a8d61eebba5ae43f2338822854264dfabad4af Merged-In: I00a8d61eebba5ae43f2338822854264dfabad4af
2020-12-11Automate NDK API coverage used by Mainline modules build integrationsophiez
Dist txt files containing NDK APIs used by Mainline modules. Cherry-pick from aosp. Test: TARGET_BUILD_APPS=com.google.android.adbd m dist apps_only Change-Id: I035f1e0cc7eb43fc09e796dbc6ce77e65b8aa3b4 Merged-In: I035f1e0cc7eb43fc09e796dbc6ce77e65b8aa3b4
2020-12-09Merge "Add test suite handling to central androidmk code" am: 464e6c71dfTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513215 Change-Id: Ic663483b0a799793e7eac61f796af3c99a204954 Merged-In: Ic663483b0a799793e7eac61f796af3c99a204954
2020-12-07Merge "Cherrypick from: ↵Yu Wu
https://android-review.googlesource.com/c/platform/build/soong/+/1463105" into mainline-prod
2020-12-07Merge "Automated NDK API coverage used by Mainline modules build ↵Sophie Zheng
integration." into mainline-prod
2020-12-06Cherrypick from: ↵Julien Desprez
https://android-review.googlesource.com/c/platform/build/soong/+/1463105 Add the Tradefed binary (suite) rules to soong Exempt-From-Owner-Approval: rebase/cherrypick Test: make cts Bug: 170967708 Change-Id: I5c234af562a6574bd5594248c232359737c5cfa6 Merged-In: Ia9303dd1fd137e227b22db1a433bcf7140f083a5
2020-12-05Merge "Refactor rust to use AndroidMkEntries" into mainline-prodTreeHugger Robot
2020-12-05Merge "Refactor python to use AndroidMkEntries." into mainline-prodTreeHugger Robot
2020-12-04Automated NDK API coverage used by Mainline modules build integration.sophiez
Add gen_ndk_usedby_apex.sh script to generate NDK API list used by Mainlain modules when modules get build. Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only Change-Id: I39e5aa7c74eff46aba06808642b2bd67ae45ba1e Merged-In: I39e5aa7c74eff46aba06808642b2bd67ae45ba1e
2020-12-04Refactor rust to use AndroidMkEntriesLiz Kammer
This is to facilitate consolidation of compatibility suite logic. Bug: 170318013 Test: go soong tests Test: m nothing & compare soong Android mk files -- only diffs are elimination of duplicate LOCAL_UNINSTALLABLE_MODULE := true lines (cherry picked from commmit I76211505b2b6afde5d0431586b77d799cf70c6b9) Merged-In: I76211505b2b6afde5d0431586b77d799cf70c6b9 Change-Id: I4391e2e079a6c205a34376b32e8c149b9d98538f
2020-12-04Convert csuite config to use AndroidMkEntriesLiz Kammer
This is to facilitate consolidation of compatibility suite logic. Bug: 170318013 Test: m nothing and compare soong Android mk files -- no diffs (cherry picked from commit Ibc60d14fdde93835124e18a5c484bbda496bdb9e) Merged-In: Ibc60d14fdde93835124e18a5c484bbda496bdb9e Change-Id: I58ea67972d08e5b17c447e35be942f61268489e4
2020-12-04Refactor python to use AndroidMkEntries.Liz Kammer
This is to enable consolidating test compatibility suite handling in Soong's AndroidMk files. Bug: 170318013 Test: go test soong tests Test: m nothing and compare soong/Android mk files -- only diffs is that lines matching "^LOCAL_SHARED_LIBRARIES := $" are absent (cherry picked from commit I4922a1c8b0231cd98ebd2bc7257956eb9c0d240c) Merged-In: I4922a1c8b0231cd98ebd2bc7257956eb9c0d240c Change-Id: I4922a1c8b0231cd98ebd2bc7257956eb9c0d240c
2020-12-03Revert "Cherrypick from: https://android-review.googlesource.com..."Yu Wu
Revert "Rebase to master@ 6976336" Revert "Cherrypicked from https://android-review.git.corp.google..." Revert "Cherrypicked from https://android-review.googlesource.co..." Revert "Rebase to master@ 6976336" Revert "Rebase to master@ 6976336" Revert "Cherrypicked from https://android-review.googlesource.co..." Revert "Rebase to master@ 6976336" Revert submission 13068802-rebase_tf_173451928 Reason for revert: It leads to test flakiness and the coverage tests are not executed at all: https://b.corp.google.com/issues/173451928#comment47 Reverted Changes: I249714c9e:Cherrypick from aosp/1478357. I572e5c2ad:Cherrypick from https://android-review.googlesourc... I56119259a:Cherrypicked from https://android-review.git.corp.... Id204d5385:Update build api library. I9693182b7:Cherrypicked from https://android-review.googlesou... I270764875:Cherrypicked from https://android-review.googlesou... Iccd4e0e52:Cherrypick from: https://googleplex-android-review... I69ef44a39:Cherrypick from: https://android-review.googlesour... Ia9303dd1f:Cherrypick from: https://android-review.googlesour... I569229605:Rebase to master@ 6976336 I58902ca81:Rebase to master@ 6976336 and copy the change in a... I32e150372:Rebase to master@ 6976336 I3460d928c:Rebase to master@ 6976336 I63e2bedb6:Rebase to master@ 6976336 I82c2f9159:Rebase to master@ 6976336 Exempt-From-Owner-Approval: revert. Change-Id: I17726ead942f72cd377d811f846151ba077f20fc Merged-In: Ia9303dd1fd137e227b22db1a433bcf7140f083a5
2020-11-30Cherrypick from: ↵Julien Desprez
https://android-review.googlesource.com/c/platform/build/soong/+/1463105 Add the Tradefed binary (suite) rules to soong Test: make cts Exempt-From-Owner-Approval: rebase/cherrypick BUG: 173451928 Change-Id: Ia9303dd1fd137e227b22db1a433bcf7140f083a5 Merged-In: Ia9303dd1fd137e227b22db1a433bcf7140f083a5
2020-11-05Propagate min_sdk_version to apexerNikita Ioffe
This way it will be correctly set in the auto-generated AndroidManifest.xml. Bug: 171096530 Bug: 157078772 Test: m Merged-In: I268f08ca5dd17fa9d6763ad70cc9a3f83891a8d6 Change-Id: I8c2cf076f6353f977e8c532d2c8013bf4ebadc36
2020-11-03Update apex/allowed_deps.txtNikita Ioffe
Bug: 171330443 Bug: 171668006 Test: build/soong/scripts/update-apex-allowed-deps.sh Change-Id: I5f3d834687121ba967d1e3aeb301c87679b2078d Merged-In: I5f3d834687121ba967d1e3aeb301c87679b2078d
2020-11-03Update allowed_deps.txt by running the scriptTony Mak
Bug: 170298047 Test: m com.android.extservices Merged-In: I6d88174ada8164236e83cbaeb3fdcccdca819999 Change-Id: I6d88174ada8164236e83cbaeb3fdcccdca819999
2020-11-02[automerger skipped] Merge "[DO NOT MERGE] Capture the build command that ↵TreeHugger Robot
executed the build system." into rvc-dev am: b157ffc6f7 -s ours am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f9142 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969380 Change-Id: I337772b18cb024981fc0cedc79f32c6c89705de1
2020-11-02Merge "[DO NOT MERGE] Capture the build command that executed the build ↵TreeHugger Robot
system." into rvc-dev
2020-11-02Merge "Default to not creating stubs for droiddoc" into mainline-prodDavid Dietrich
2020-11-02[automerger skipped] [DO NOT MERGE] Capture the build command that executed ↵Patrice Arruda
the build system. am: 807a8f9142 am: 43743ee2ce -s ours am: b777aac4c8 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Ibd9988be958e259fcc7a5a935badf27c899c533d
2020-11-02[automerger skipped] [DO NOT MERGE] Capture the build command that executed ↵Patrice Arruda
the build system. am: 807a8f9142 am: 43743ee2ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Ic96b958a70e654d6f8893bdbd6777027974510fd
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system. am: ↵Patrice Arruda
807a8f9142 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335 Change-Id: Ib496613df81acb9e17f1ca4b717583fab39643cc
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system.Patrice Arruda
We need to capture the user build command to understand what additional arguments is passed in to Soong. This data is useful to know which targets are being executed and have statistics on top build targets are specified. Bug: b/169453712 Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked in soong_metrics proto. Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: If9a1443eff6b48cee865ea914370261f5e0cfee6
2020-11-02[DO NOT MERGE] Capture the build command that executed the build system.Patrice Arruda
We need to capture the user build command to understand what additional arguments is passed in to Soong. This data is useful to know which targets are being executed and have statistics on top build targets are specified. Bug: b/169453712 Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked in soong_metrics proto. Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756 Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756
2020-10-21Merge "Enable defaults in soong_config_module_type props" into mainline-prodTreeHugger Robot
2020-10-21Update allowed deps for sdkext apexNikita Ioffe
Test: m Bug: 171096530 Bug: 171330443 Change-Id: Iacaa4e8c6ed2e3854ef973a84bb0e44c433c00d3 Merged-In: Iacaa4e8c6ed2e3854ef973a84bb0e44c433c00d3
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: ↵Kousik Kumar
04f6efa716 am: 72fd2abc5c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: I7dfcdf97ae4dcb1b3fd4313a28311de2e6d10449
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: Ib4848042fdc9926a9929e6eebf416e01d045fd90
2020-10-21Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49fKousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656 Change-Id: If52cdcd09678cc154257b22b869f6ebabd8557f0
2020-10-20Merge "Add android app property rename_resources_package" into mainline-prodLiz Kammer
2020-10-20Deprecate both USE_GOMA and FORCE_USE_GOMA flagsKousik Kumar
Test: m USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox m FORCE_USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox both result in error message being printed. Bug: b/171325288 Change-Id: I94ccaf217dba71aca990d88d205bad669a49a2f5 Merged-In: I94ccaf217dba71aca990d88d205bad669a49a2f5
2020-10-20Enable defaults in soong_config_module_type propsLiz Kammer
Test: go tests Test: m Merged-In: I8fe8c17320086034f4745b2da974a2c73c949eaf Change-Id: I8fe8c17320086034f4745b2da974a2c73c949eaf
2020-10-19Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 ↵TreeHugger Robot
to rvc-dev" into rvc-dev am: 7790f714d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151 Change-Id: I5202c317eb520761e7c556518cc7dceede749c3d
2020-10-19Add android app property rename_resources_packageLiz Kammer
This relands I70a43c2163709afc90262d74f975ce14a556cf55 with a property to disable renaming of the package in resource files to support compatibility with packages that would be infeasible to change without causing failures. When rename_resources_package is true, uses aapt2 flag to change the package name encoded in the resources table for override apps. Test: app_test.go Bug: 147434671 Merged-In: I3a051ddeb5979f9c0838d176656a1b5cf2677a9b Change-Id: I3a051ddeb5979f9c0838d176656a1b5cf2677a9b
2020-10-19Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 ↵TreeHugger Robot
to rvc-dev" into rvc-dev
2020-10-19resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 to rvc-devPatrice Arruda
Test: I solemnly swear I tested this conflict resolution. Bug: b/169395325 Change-Id: Iaac2f8ef4b452c95bdc4584697c3e4e9ed69aa5c Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76 Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
2020-10-16resolve merge conflicts of 0f35aeec67dc57395216272fe8905f13dd475747 to ↵Liz Kammer
mainline-prod Change-Id: If7d2d63979907e9658dc742a7af5a8056f9e54c6
2020-10-16Merge "Remove special-cased stub deps on framework-res" into rvc-devLiz Kammer
2020-10-15Collect the hostname of the machine as a metric. am: af7b75b8dbPatrice Arruda
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849657 Change-Id: I21d6d894ce261bb9181dc6863c41ff67c5af904a
2020-10-15Make test api extend system in sdk_library.goAnton Hansson
The test stubs for the "main" android API are being changed to incude @SystemApi annotated APIs. Update sdk_library to make modules and optional libraries follow the same principle. Bug: 129133308 Test: presubmit Exempt-From-Owner-Approval: cp Change-Id: I7bd940e1a8127d954d30c532c74d684a5ba9d33c Merged-In: I7bd940e1a8127d954d30c532c74d684a5ba9d33c (cherry picked from commit 13dbaac5b6cc4f135404d2954541fd44b09e89e0) (cherry picked from commit 4fe970f3036b74b7e4a5aeff1dd04a9d28a1355f)
2020-10-15Remove special-cased stub deps on framework-resAnton Hansson
This dep is now possible to express in native Android.bp syntax, which makes the build easier to understand. Bug: 161214753 Test: build sdk, diff out/dist before and after Change-Id: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce Merged-In: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce