Commit Graph

86485 Commits

Author SHA1 Message Date
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
Peter Collingbourne
283871520b Merge "cuttlefish: Add a fullmte target." am: 3f91ff5d47 am: 0d933e0cc4 am: 7c6db6d1d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2490801

Change-Id: Ieb397d5fe786f5e2f00b64e7af8066a48f509610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:52:00 +00:00
Sijie Chen
539fbc287e Merge "Clean additional Robolectric variable" 2023-03-23 22:51:42 +00:00
Spandan Das
8a02633b56 Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a am: 11fbf45243
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I62e58698f9a9fd511b1f69df5ae019f16976a1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:51:11 +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
666dffa75b Merge "Add a test for b builds with --" am: 26737b6bf3 am: 45c93c3a81 am: c1d5df78f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2504375

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

Change-Id: Ib68ba885763bf62ead5604e3605b58ed66337d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 21:29:44 +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
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
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
Steven Moreland
aa81ee2a6e remove reference to old VTS config
No longer exists, no longer used.

Bug: 274790216
Test: N/A
Change-Id: Id11921707cd5141235850d88a6d2397e85726532
2023-03-22 21:11: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
Oleg Lyovin
6d75a854ef Fix choosing wrong diff tool for recovery-from-boot patch
'bsdiff' tool should be used when recovery and boot image
have mismatching entries. This includes not only the case
when system_as_root enabled, but include_recovery_dtbo and
include_recovery_acpio too.

Add check if they are enabled to synchronize logic with
core/Makefile, which already takes this into account.

Test: make dist -j
Change-Id: Ie673403ae8eae446d006cc524dd48ac6c56194fc
Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
2023-03-22 17:53:26 +03: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