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
Android Build Coastguard Worker
19b2a69afa
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L87300000959339500 into tm-qpr2-release.
...
COASTGUARD_SKIP: I3d0124e7fff91f27a1a9c0a18ede1f94daaf0d8a
Change-Id: I02f990bb0567705453e457be81b5029207b62c9e
2023-03-23 17:54:05 +00:00
Android Build Coastguard Worker
8707e08839
Version bump to TQ2A.230405.003.E1 [core/build_id.mk]
...
Change-Id: I3d0124e7fff91f27a1a9c0a18ede1f94daaf0d8a
2023-03-23 17:47:50 +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
Android Build Coastguard Worker
01cd06e0c5
Make change and version bump to TQ3A.230323.001
...
Snap for 9794482 from de0873f77b
to tm-qpr3-release
Change-Id: Idb1680efb7df923e581001b220a6a75c86e0e20d
2023-03-23 00:04:17 +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
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
Android Build Coastguard Worker
bbfe435bc6
[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L98000000959299536 into tm-qpr2-release.
...
COASTGUARD_SKIP: I5fc6bef128af7ff9525fa5d75cf8ef49266ee381
Change-Id: I4a8df1ca2bea95f307a928ef1757e6888f830677
2023-03-22 04:19:16 +00:00
Android Build Coastguard Worker
9281c86516
Version bump to TQ2A.230405.003.D1 [core/build_id.mk]
...
Change-Id: I5fc6bef128af7ff9525fa5d75cf8ef49266ee381
2023-03-22 04:11:07 +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
df75dca618
Merge "Remove tradefed-no-fwk from suites" into sc-dev
2023-03-22 00:32:22 +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
Android Build Coastguard Worker
9278d1bf21
Make change and version bump to TQ3A.230322.001
...
Snap for 9787270 from ff3bc8bedf
to tm-qpr3-release
Change-Id: I6cb953b79be8ebfc7ce5e539950041c85c011fa4
2023-03-22 00:04:17 +00:00
Roman Kiryanov
dd0483995d
Retire QEMU_DISABLE_AVB
...
never enabled
Bug: 274103438
Test: presubmit
Change-Id: I4296bef2924d2f041d3e9cbfd2bb3ab0c2a72c75
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-03-21 15:30:21 -07:00
Treehugger Robot
c02e0f7ad8
Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
am: 8925166fff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535
Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf
Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
am: 22d145424a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995
Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:48:18 +00:00
Treehugger Robot
8925166fff
Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535
Change-Id: I3d927a6953c24d49ad1f3a26bd3ffbe88b399c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:11:34 +00:00
Nicolas Geoffray
22d145424a
Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995
Change-Id: I2888a5d1b20ee95a94514fed426e4bf9b5e3be51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 16:10:03 +00:00
Treehugger Robot
d7600be9a6
Merge "Disable system_server.zip generation for ART prebuilts"
2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36
Merge "Use the boot image mainline extension when dexpreopting in Make."
2023-03-21 14:51:20 +00:00
Hsin-Yi Chen
f623c266ca
Revert "remove health library from VNDK"
...
This reverts commit dbbe29a15f
.
Bug: 274406085
Reason for revert: VNDK 33 should not be modified in U branches.
Change-Id: If374d4718243e04e03c48a9c6bbd8f10e3eea898
2023-03-21 09:36:26 +00:00
Pranav Gupta
1da7219ed1
Disable system_server.zip generation for ART prebuilts
...
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false
Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
2023-03-21 07:30:37 +00:00
Android Build Coastguard Worker
abb8f2db14
[coastguard skipped] Merge sparse cherrypicks from sparse-9782881-L69400000959252050 into tm-qpr2-release.
...
COASTGUARD_SKIP: I4bdd3a4bc4903304f6381843f5582fe23bd49afd
Change-Id: If77b45e19636eeef2d6fb7d67ed9edaabbc9ba07
2023-03-21 04:52:02 +00:00
Android Build Coastguard Worker
e1ee391b18
Version bump to TQ2A.230405.003.C2 [core/build_id.mk]
...
Change-Id: I4bdd3a4bc4903304f6381843f5582fe23bd49afd
2023-03-21 04:46:41 +00:00
Treehugger Robot
fe599cb1b2
Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
am: 5c129b5fc7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705
Change-Id: Ie1d60fecb5d5a5dc644fb909e421581582ffe8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 03:58:02 +00:00