Commit Graph

84046 Commits

Author SHA1 Message Date
Colin Cross
9ee11cef7c Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: I64b731d3f4dc1041c016ec8d460856227bd41e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:54:27 +00:00
Colin Cross
d0aa18ed07 Merge changes Id8b48c8c,I3b66304c am: ffda9a5093
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666

Change-Id: I702df2723f947b6259d08d28009596ec4cf2ed4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:25:54 +00:00
Colin Cross
ffda9a5093 Merge changes Id8b48c8c,I3b66304c
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
2023-03-24 15:48:32 +00:00
Sijie Chen
74aebc8e55 Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I9e3fdfb1071c065c39f118ceedf17d80457a1909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 23:54:21 +00:00
Colin Cross
c9cb74d257 Build the whole platform for aosp_riscv64
Remove the hacks that prevent building the rest of the platform
for aosp_riscv64.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: Id8b48c8c456e76624647f153c7dd9612569fc7a1
2023-03-23 16:29:28 -07:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
2023-03-23 16:29:28 -07:00
Sijie Chen
5a678d06ee Merge "Clean additional Robolectric variable" am: 539fbc287e
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869

Change-Id: I2c92bc4492096506747ddbacb5d1e55d438294e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 23:23:56 +00:00
Sijie Chen
539fbc287e Merge "Clean additional Robolectric variable" 2023-03-23 22:51:42 +00:00
Peter Collingbourne
7c6db6d1d6 Merge "cuttlefish: Add a fullmte target." am: 3f91ff5d47 am: 0d933e0cc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2490801

Change-Id: I5fa37befd0619fba3f777aa832fc0b261dd570e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:20:56 +00:00
Spandan Das
11fbf45243 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I7f050b963936c74b6a6a3469bad084b04de7479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:20:28 +00:00
Peter Collingbourne
0d933e0cc4 Merge "cuttlefish: Add a fullmte target." am: 3f91ff5d47
Original change: https://android-review.googlesource.com/c/platform/build/+/2490801

Change-Id: I99c58de83c4e3b9e6046785895581297dc515ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 21:50:04 +00:00
Spandan Das
b9a6afe05a Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I875f2ea92b59216bc6ce67c5cd6ec339ccf86b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 21:49:38 +00:00
Peter Collingbourne
3f91ff5d47 Merge "cuttlefish: Add a fullmte target." 2023-03-23 21:39:19 +00:00
Spandan Das
0326e64c3c Merge "Update hardcoded references to android_*stubs_current" 2023-03-23 21:32:03 +00:00
Cole Faust
c1d5df78f4 Merge "Add a test for b builds with --" am: 26737b6bf3 am: 45c93c3a81
Original change: https://android-review.googlesource.com/c/platform/build/+/2504375

Change-Id: I21efe6960140d5ded39141800236bd5bbffa5e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 21:11:56 +00:00
Cole Faust
45c93c3a81 Merge "Add a test for b builds with --" am: 26737b6bf3
Original change: https://android-review.googlesource.com/c/platform/build/+/2504375

Change-Id: I20c3b22f53a21049be326b1295ec7d17b13e2018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:57:04 +00:00
Sunil Ravi
40167b0380 Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002

Change-Id: I4007ed1a4c988f28f58dc7bd2899b9aa32b65b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:55:45 +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
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
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
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
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
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
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
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
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
Julien Desprez
df75dca618 Merge "Remove tradefed-no-fwk from suites" into sc-dev 2023-03-22 00:32:22 +00:00