Commit Graph

86717 Commits

Author SHA1 Message Date
Treehugger Robot
685c7082bc Merge changes Ie0234187,Iace22e38 am: e042768922 am: aa44c8d68f am: 654bd5065b
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: Ib7f4f2b88080ee17bc90c70166a2adad566676b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:41:51 +00:00
Cole Faust
26737b6bf3 Merge "Add a test for b builds with --" 2023-03-23 20:35:40 +00:00
Sunil Ravi
b25981143f Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: If312fb178f6a4609176af2c1a150db92d5658287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:22:23 +00:00
Sunil Ravi
691c92f567 Merge "Add config to skip state toggle off/on for Wi-Fi NAN" 2023-03-23 19:53:23 +00:00
Treehugger Robot
654bd5065b Merge changes Ie0234187,Iace22e38 am: e042768922 am: aa44c8d68f
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: Idf93078c8adbc3fd24dad203cc12a278bb3eae7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 19:46:30 +00:00
Treehugger Robot
aa44c8d68f Merge changes Ie0234187,Iace22e38 am: e042768922
Original change: https://android-review.googlesource.com/c/platform/build/+/2500963

Change-Id: I9f97ec9e4d2b29e7c6c5438bfdeaacd84e4e3b86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:40:59 +00:00
Martin Stjernholm
4bbb9744db Use a better arbitrary target arch for this host-only "device".
This "device" is used for linux_bionic builds that may build with
prebuilts (from prebuilts/runtime/mainline and prebuilts/module_sdk) on
master-art and master-art-host. The ndk arch suite was recently
extended to riscv64 (https://r.android.com/2488597), and those
prebuilts don't include that arch, which caused a failure in Soong
(even though target prebuilts aren't actually used here).

Test: lunch armv8-eng
      env DIST_DIR=out/dist ./art/tools/dist_linux_bionic.sh \
        -j80 com.android.art.host
  on master-art
Bug: 274756655
Change-Id: I3e7cdc7dc4ed45ffde4ac139b00d1e9e0148744b
2023-03-23 18:39:54 +00:00
Treehugger Robot
e042768922 Merge changes Ie0234187,Iace22e38
* changes:
  Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS
  Retire QEMU_USE_SYSTEM_EXT_PARTITIONS
2023-03-23 18:00:20 +00:00
Treehugger Robot
8912bb943c Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f am: 2c309f0175 am: e89fa4075a
Original change: https://android-review.googlesource.com/c/platform/build/+/2504717

Change-Id: I21fbd4266e37628ce3ceda53b75ca971f5925d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 10:16:41 +00:00
Treehugger Robot
e89fa4075a Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f am: 2c309f0175
Original change: https://android-review.googlesource.com/c/platform/build/+/2504717

Change-Id: I1a398e2f226a26cb5aa1f45f29c612c30d56c445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:38:25 +00:00
Treehugger Robot
2c309f0175 Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" am: e57ba5736f
Original change: https://android-review.googlesource.com/c/platform/build/+/2504717

Change-Id: I9fa690317b2c67076c5bdd7c427a6c11009107b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:02:17 +00:00
Treehugger Robot
e57ba5736f Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64" 2023-03-23 08:34:11 +00:00
Android Build Coastguard Worker
684eb78897 Version bump to UP1A.230323.003 [core/build_id.mk]
Change-Id: Iaf1d764908f49227eb6fd16768b12707c0c14ba4
2023-03-23 06:56:17 +00:00
Android Build Coastguard Worker
024640bfa2 Version bump to UP1A.230323.002 [core/build_id.mk]
Change-Id: I5ab08bbe14fb6e705a1eb5fc2ef7229004efbe0e
2023-03-23 03:28:17 +00:00
Roman Kiryanov
6a4773340a Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS
PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled.

Bug: 274103438
Test: presubmit
Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
6715e76360 Retire QEMU_USE_SYSTEM_EXT_PARTITIONS
always enabled

Bug: 274103438
Test: presubmit
Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
fd5e673f9f Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64
aosp_64bitonly_x86_64 gets broken by the emulator
changes otherwise.

Bug: 274103438
Test: m
Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:21 -07:00
Android Build Coastguard Worker
17798110eb Make change and version bump to UP1A.230323.001
Snap for 9794275 from 94b2b7a00e to udc-release

Change-Id: Ic1cc74ada7ba8362d84ce169049337b716f434dc
2023-03-23 02:27:13 +00:00
Android Build Coastguard Worker
bd2e64d372 [coastguard skipped] Merge sparse cherrypicks from sparse-9767782-L26400000959323329 into udc-release.
COASTGUARD_SKIP: Id3fe09e30fd91ed860e89d46abddf66f2317aa8d

Change-Id: Ifa8df0951f22b8cf5be4539afe06de5c08a56640
2023-03-23 00:25:46 +00:00
Android Build Coastguard Worker
659014b669 Version bump to UP1A.230316.003.A2 [core/build_id.mk]
Change-Id: Id3fe09e30fd91ed860e89d46abddf66f2317aa8d
2023-03-23 00:20:34 +00:00
Cole Faust
7018428a85 Add a test for b builds with --
Using -- to indicate the end of arguments has caused issues multiple
times in the past.

Test: ./build/make/tests/roboleaf_tests.sh
Change-Id: I4aef2f1672b917587dd9a2dbe15934db0b0ae0cd
2023-03-22 16:28:11 -07:00
Android Build Coastguard Worker
11acb36b12 Version bump to UP1A.230322.002 [core/build_id.mk]
Change-Id: Ib80484bc77e8b212fefdbc9f018257daf64a55c2
2023-03-22 20:09:42 +00:00
Ye Jiao
0786af077c Add config to skip state toggle off/on for Wi-Fi NAN
If STA and NAN share the same iface wlan0, Wi-Fi vendor HAL service
sends eventDisabled to NAN framework when STA setMacAddress to wlan0.
This disables NAN when STA is turned on.

Since NAN always uses its own random MAC instead of using MAC of STA,
this action is not necessary and gets NAN kicked off for no benefits.

We add a build time configuration to optionally disable this behavior.

Bug: 273426515
Test: manually test

Change-Id: If0d84b3898387b75392c8012640bc728126f2cff
2023-03-22 20:05:41 +00:00
Treehugger Robot
94b2b7a00e Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a am: 3bd2cb00da am: a509c972f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959

Change-Id: I30797b4e2971af785c2a370c5c15cd61b435fdaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:29:40 +00:00
Hsin-Yi Chen
5f09a5b114 Merge "Revert "remove health library from VNDK"" am: 14f240351e am: 4109e2bef4 am: 292b420dcf
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615

Change-Id: I527f9c73a3ec4dbf7d58393fb82f6e24c961b2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:29:29 +00:00
Julien Desprez
78798af5ec Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10 am: 335a11d79c am: de0873f77b am: be8fb0306d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I79f619e39878016ee3f33e18ab4bfa892920f1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:29:02 +00:00
Julien Desprez
cc573fbd8e Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3 am: 1c6aa54306
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I49240af2b16f222e86a26c935a80aca4816ba290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 04:25:15 +00:00
Treehugger Robot
a509c972f5 Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a am: 3bd2cb00da
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959

Change-Id: Icdb2e1586f7ca248cc8d067dd6f22e77f642c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:50:12 +00:00
Hsin-Yi Chen
292b420dcf Merge "Revert "remove health library from VNDK"" am: 14f240351e am: 4109e2bef4
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615

Change-Id: I3183bdc592a47bb92ce889c99ff485f8b199829f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:49:35 +00:00
Julien Desprez
be8fb0306d Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10 am: 335a11d79c am: de0873f77b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: If0c49e73ae73ea3b22820b42e042a14e260ba87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:49:19 +00:00
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:48:26 +00:00
Julien Desprez
de0873f77b Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10 am: 335a11d79c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: If78ca764fc2eea83d646992091cc01d5098e878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:11:55 +00:00
Julien Desprez
660e9fa2e3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:11:39 +00:00
Treehugger Robot
3bd2cb00da Merge "Retire QEMU_DISABLE_AVB" am: e8554eff3a
Original change: https://android-review.googlesource.com/c/platform/build/+/2500959

Change-Id: I05c1e6b5976b09e466af2844f9228664f5140b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:09:58 +00:00
Hsin-Yi Chen
4109e2bef4 Merge "Revert "remove health library from VNDK"" am: 14f240351e
Original change: https://android-review.googlesource.com/c/platform/build/+/2499615

Change-Id: I157620ff3791a34cb82b3c1593fae0d7dcebb83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:09:38 +00:00
Julien Desprez
816822cb78 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10 am: e20777e6a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I2a042fadccb08cdc8d7ee135e4291bc0f9a32353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:48:16 +00:00
Julien Desprez
f4c157e4cf Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 6bc1b2deed
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I63a0d26d524d005f5d3fa91d8d457950bef86c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:48:06 +00:00
Treehugger Robot
e8554eff3a Merge "Retire QEMU_DISABLE_AVB" 2023-03-22 02:45:08 +00:00
Hsin-Yi Chen
14f240351e Merge "Revert "remove health library from VNDK"" 2023-03-22 02:15:35 +00:00
Julien Desprez
335a11d79c Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I2ccf5c714ce18825d79a80f85d99d10fd4469a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:14:07 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:13:57 +00:00
Julien Desprez
e20777e6a7 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I9d758001abe8807315514e376d9d59cc9678b642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:13:28 +00:00
Julien Desprez
6bc1b2deed Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I1fd20f11bb37a544fb19558d4cbf77571a0bd899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:13:17 +00:00
Android Build Coastguard Worker
403bcf844b Make change and version bump to UP1A.230322.001
Snap for 9786938 from 0db017be76 to udc-release

Change-Id: I6e715e1ce7b1a0d3993e150c5f65ce3a6e96425a
2023-03-22 02:08:00 +00:00
Julien Desprez
b3e982fc10 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I48f51283793c87fb2a2dd2f1aa760fca9be83d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:53 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:44 +00:00
Julien Desprez
28893e555e Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: If69d8abad0afb1a0da969447dd82ea1b7ae8b7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:59:05 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:58:49 +00:00
Julien Desprez
ef94a26990 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I2b8124ebb03c67542241240aa196743d0eb06d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:55:52 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
2023-03-22 00:32:22 +00:00