aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-21Make change and version bump to aml_go_wif_330911000 for mainline module ↵aml_go_wif_330911000android13-mainline-go-wifi-releaseAndroid Build Coastguard Worker
file: None Change-Id: Iff56e99bd293a2c8eb6a8bc518dae4ee2929aad7
2022-07-13Merge "Add permission to the list of individually toggleable modules" into ↵Paul Duffin
tm-mainline-prod
2022-07-12Keep proguard fields for lite runtime of jarjared classzhidou
Some targets rename protobuf.MessageLite with jarjar rules. This change adds keep rules to keep the fields of renamed classes. Bug: 233746531 Test: m checkbuild. Change-Id: I986f05455b45651749fb5f819661041d7399f683
2022-07-12Add permission to the list of individually toggleable modulesPaul Duffin
This is safe even though permission is not an optional mainline module because devices that support mainline must pass GTS and testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS currently tests this, along with testMainlineApprovedTrain which checks mandatory/optional, signing keys, and if what's preloaded are part of approved trains. Bug: 238175656 Test: # Cherry pick to branch that has Google signed prebuilts for # permission and builds from prebuilts by default. # Update the permission to an sdk snapshot generated with # r.android.com/2151273. # Make sure that the permission is built from prebuilts by # default Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
2022-07-12Make change and version bump to aml_go_wif_330910000 for mainline module ↵Android Build Coastguard Worker
file: None Change-Id: I7ef1bd9e4d8b3acb5a0c721d61ca144c6632d1a3
2022-06-23Do not override setting of SOONG_CONFIG_<m>_module_source_build am: dccd189954Paul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19033310 Change-Id: I0afaabf48d53e9a2cdc9447a88c32ca3d2bda9a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23Do not override setting of SOONG_CONFIG_<m>_module_source_buildandroid13-tests-devPaul Duffin
Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where <m> is one of wifi, uwb or bluetooth) that was made before the core/android_soong_config_vars.mk was processed would be replaced with false. This change will only set them to false if they have not been previously set. Bug: 233965247 Test: m nothing # After setting SOONG_CONFIG_wifi_module_source=true before this # code. Without this change out/soong/soong.variables uses false # for the wifi_module/module_source config variable. With this # change it uses true. Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
2022-06-23Change Bluetooth apex mountpoint am: 9c2f61119cWilliam Escande
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19038222 Change-Id: I626792cb3f7da13871d7adfd09ddd37a8eac9ac7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22Change Bluetooth apex mountpointWilliam Escande
Apex name has been changed to com.android.btservices Changing mount point accordingly Bug: 235892590 Test: Flash / boot bt / look logs & pair a device Change-Id: I1e32f26c5e2b121391bc85c6b50b2ccdf57ff5de
2022-06-22Merge "Use the btservices apex for bluetooth stack" into tm-dev am: ac0f3f2211Oriol Prieto Gascó
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18985505 Change-Id: I64497517d91455096feb37ca1659bb2eba8ce4a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22Merge "Use the btservices apex for bluetooth stack" into tm-devOriol Prieto Gascó
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: ↵Bassem Khalife
7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 5c3a73607d -s ours am: 8634e5b861 -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 2489eee173 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: Id771cc06ab4d2b23f0249723f87667513acf8f0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: ↵Bassem Khalife
7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 5c3a73607d -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 2489eee173 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I2d95ee0e2dfd53835237c4cbf1d6b7a850ce5b44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: ↵Bassem Khalife
7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours am: 1c7d177fd9 -s ours am: 61a0d7088c -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: Ibc5864996d0edf2f95ce4d3e28b6ea5c8efa29f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: ↵Bassem Khalife
7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours am: 1c7d177fd9 -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I34f0eb19d641e1194f275af7da6a505123e80d60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: ↵Bassem Khalife
7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I3b2f525ebfe6abf8384dc4318b7d27026f8b7f89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: ↵Bassem Khalife
7966d37150 am: 6e41c8bb4d am: 7f1af3280f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I746304aa9a455c69126662617dd8a0ba893a86e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: ↵Bassem Khalife
7966d37150 am: 6e41c8bb4d am: 7f1af3280f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: Ic09aed654941dd36de79b2ae6966ab7552217ef7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: ↵Bassem Khalife
7966d37150 am: 6e41c8bb4d Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I262b4141ad207cbba0d42c516dc6713ff6fe167a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: ↵Bassem Khalife
7966d37150 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I716d2d011ca60e7fbde662edf57e427e07c1c4d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abdBassem Khalife
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I3d2518edb16ff2cf259640ce2c6612fc2fe587cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01 am: 2489eee173Bassem Khalife
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487 Change-Id: I9558ac59a1d2b8012bc68c979842d3c20cc8580e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 52fd4edb47 -s ↵Bassem Khalife
ours am: 080e4d7642 -s ours am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 9f2be867c4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19002854 Change-Id: Ia284fde78fd69c43ed6442c9d83d1a01fb5d7d45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21[automerger skipped] Update Security String to 2022-08-01 am: 52fd4edb47 -s oursBassem Khalife
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 9f2be867c4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19002854 Change-Id: I57ffd10f012de2502d7835bcb3b7dd6b9d46dcc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21Update Security String to 2022-08-01Bassem Khalife
Bug: 232157623 Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65 Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-19Use the btservices apex for bluetooth stackOriol Prieto Gasco
Test: TH Bug: 236187653, 236192423 Change-Id: Id57f3e86f243948d3ea21c6e1a7150ab07c317b5
2022-06-17Merge "Merge "Set `TARGET_USES_64_BIT_BINDER` for mainline_sdk." am: ↵TreeHugger Robot
d02946c4c3 am: 21d0333357 am: 04ed50089e am: fcc760aa8e am: 679d9572fb" into tm-mainline-prod
2022-06-17Update Security String to 2022-08-05 am: 9f2be867c4Bassem Khalife
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18911707 Change-Id: I8357cff621ffc4fdc214286f8bb7173de31bfa72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16Make change and version bump to aml_go_wif_330514000 for mainline module ↵Android Build Coastguard Worker
file: None Change-Id: Ide34f399b05d195c0fc2861a5212c05855630349
2022-06-16Make change and version bump to aml_go_wif_330513000 for mainline module ↵Android Build Coastguard Worker
file: None Change-Id: Ic50d7bf0f868eed07213a30c3ff2c931cc8491cc
2022-06-15Update Security String to 2022-08-01Bassem Khalife
Bug: 232157623 Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65 Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15Update Security String to 2022-08-05Bassem Khalife
Bug: 232157623 Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15Merge "Don't exclude docs build from using prebuilts" into tm-dev am: 29ae21ebb7Anton Hansson
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18886329 Change-Id: If4bdd99bdcdb4662d9e1af68a606f4ce2774bd94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Don't exclude docs build from using prebuilts" into tm-devAnton Hansson
2022-06-15Merge "Set `TARGET_USES_64_BIT_BINDER` for mainline_sdk." am: d02946c4c3 am: ↵Jiakai Zhang
21d0333357 am: 04ed50089e am: fcc760aa8e am: 679d9572fb Original change: https://android-review.googlesource.com/c/platform/build/+/2121572 Change-Id: I6ab42b109894531e647a720ac3084d7bf6e75511 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from commit e88b6b26e059867fa2396763df6513b02ed01042) Merged-In: I6ab42b109894531e647a720ac3084d7bf6e75511
2022-06-14Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-dev am: 0e729cfc1dBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874017 Change-Id: Id4aa7e029802c44941ef131287dd10bc1322dc15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Revert "Record license text for every dist target." am: 29d723fb4aBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874016 Change-Id: I7a8070e2fd6474a46112f306ab5e02e379c31f8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-devBob Badour
* changes: Revert "Create lists of projects to share per dist target" Revert "Record license text for every dist target."
2022-06-14Don't exclude docs build from using prebuiltsAnton Hansson
Even though it doesn't have google modules in PRODUCT_PACKAGES, the docs build wants to use prebuilts when the rest of the branch does. Bug: 230478310 Test: m docs (inspect MODULE_BUILD_FROM_SOURCE) Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
2022-06-13Revert "Create lists of projects to share per dist target"Bob Badour
Revert submission 18821068 Reason for revert: Advised to switch to using TARGET_BUILD_APPS Reverted Changes: Ibd737c0dd:Record license text for every dist target. Ibf5a9869d:Create lists of projects to share per dist target Change-Id: I4a2c7b3c74b446ce3748217be30da70c060da0dd Merged-in: If56a1fceb5da66b90b7b0ec2275ec429661515b4
2022-06-13Revert "Record license text for every dist target."Bob Badour
Revert submission 18821068 Reason for revert: Advised to switch to using TARGET_BUILD_APPS Reverted Changes: Ibd737c0dd:Record license text for every dist target. Ibf5a9869d:Create lists of projects to share per dist target Change-Id: Ib0007bf6989c25cc2503f8feac35682d13f0a2b7 Merged-in: I1442998bbafe909a0796abdb2e9691a0c4c099d6
2022-06-13Add bluetooth and uwb to the optional modules list am: 70a11a34c0Paul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18839974 Change-Id: Ic625791c5ec6d990287cce1400627ab22480efd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Add wifi_module/source_build Soong config variable am: 9a5e3d53a8Paul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18850363 Change-Id: I6ec6b96ae757e8f427bcd649afd375a68c3aad39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-11Add bluetooth and uwb to the optional modules listPaul Duffin
Bug: 233965247 Test: m nothing Change-Id: I9618844499d6f1da4d5e9b5b31bfaca86c4de980
2022-06-11Add wifi_module/source_build Soong config variablePaul Duffin
As an optional module, wifi has its own Soong config variable. This change ensures that it is controlled by the same environment variable as the rest of the modules. Bug: 233965247 Test: # Unpack wifi snapshot that uses wifi specific Soong config. m nothing # Without this the build fails as it uses the wifi prebuilts # which do not work in AOSP. # With this change the build passes as it uses the wifi # sources. Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08 (cherry picked from commit 4f4b6d776df71655c8d7723f5c0c67c75c0c6a0e) Merged-In: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
2022-06-10Merge changes Ibd737c0d,Ibf5a9869 into tm-dev am: 52a972709dTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821068 Change-Id: Ic030419bd3ced1960eb1d22bfd24bfea25291da9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Create lists of projects to share per dist target am: 570381b746Bob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821067 Change-Id: I8ed984b5211928c84507696420a842867d7fe206 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Merge changes Ibd737c0d,Ibf5a9869 into tm-devTreeHugger Robot
* changes: Record license text for every dist target. Create lists of projects to share per dist target
2022-06-10Merge "Improve flags for compliance tools." into tm-dev am: 99b87147ecTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821066 Change-Id: I1d92e1c3e6fb793c4b4928fff709a782fb6611ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Fix license package name and provide license text. am: b5353a160bBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18816793 Change-Id: Iad01eb06c081d7d20acd21d46cb5cf9da99c16d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>