Roman Kiryanov
1b292bf89a
Retire unused variable
...
Bug: 274103438
Test: presubmit
Change-Id: I66deda33e8cf5b4bdd00621ede23bc5ad89b6bbb
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-28 08:27:45 -07:00
Zhi Dou
c6cfd470c5
[automerger skipped] Merge "New product config flag to gate blueprint modules" into tm-qpr-dev am: 1658acefc6
-s ours
...
am skip reason: Merged-In Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7 with SHA-1 00114d4418
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22102624
Change-Id: Iddbee4c6147d8e69a71340a19884d12cfead292b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:32:18 +00:00
Spandan Das
e0922b5907
[automerger skipped] New product config flag to gate blueprint modules am: 251205d866
-s ours
...
am skip reason: Merged-In Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7 with SHA-1 00114d4418
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22102624
Change-Id: Ic2df3bb0dbc2b4cbfe6452f024da75a88d8cf7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:32:11 +00:00
Ulya Trofimovich
cc5c6a74ee
Revert "Disable dexpreopt for aosp_riscv64"
...
This reverts commit ae7f543b7c
.
Reason for revert: Enabling dexpreopt for RISC-V (there is still no
compiler support, but dex2oat runs in verification mode and does
not attempt any compilation with https://r.android.com/2510739 ).
Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
2023-03-28 13:15:35 +00:00
Zhi Dou
1658acefc6
Merge "New product config flag to gate blueprint modules" into tm-qpr-dev
2023-03-28 13:12:35 +00:00
Sam Delmerico
4c3b83fe70
add PRODUCT_SOURCE_ROOT_DIRS product variable
...
Change-Id: I31590eb133511a5dbdb8d6fe436cf511d1a160a2
2023-03-27 14:40:50 -04:00
Roman Kiryanov
8e7f862bce
Add the system_dlkm partition to goldfish
...
required by GKI
Bug: 274103438
Test: atest -c vts_dlkm_partition_test
Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-27 11:21:38 -07:00
Treehugger Robot
e5d89d51e6
Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51
am: 95f3ebf3cf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191
Change-Id: I04128e235dd8700783f3797f0eaa58f75f2ebb6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-25 01:45:53 +00:00
Treehugger Robot
95f3ebf3cf
Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191
Change-Id: I8cc31f041467ae8a4a063669e04406ee37a6031f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-25 01:01:32 +00:00
Treehugger Robot
f8a3ca9f51
Merge "Increase dump-words-to-file capacity"
2023-03-25 00:03:52 +00:00
Peter Collingbourne
fd95f097fe
Make kernel prebuilts writable after copying them.
...
Images created by Bazel are read-only, which leads to build failures when
later commands attempt to modify them, as the cp command will also copy
the file permissions. Fix it by using chmod to make the images writable
after copying them.
Change-Id: I8aaa7c4395d38b674f76a7f0ebfa95e1f2da0af0
2023-03-24 16:39:17 -07:00
Treehugger Robot
68d2e6408d
Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa
am: f9915e1328
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506000
Change-Id: I2d7079d6e84d4b0c41ecf151289c5f5a19b316f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 22:48:26 +00:00
Treehugger Robot
f9915e1328
Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506000
Change-Id: I4ff63b4ed9d3ca40a61fb5928b27fe34bf6d9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 22:03:38 +00:00
Treehugger Robot
e07ac36efa
Merge "Use a better arbitrary target arch for this host-only "device"."
2023-03-24 21:27:15 +00:00
Bob Badour
0bd9a626bd
Increase dump-words-to-file capacity
...
Test: m droid dsit
Change-Id: I092e032a8d8f943dbb2eddd4bb7c57df40bbcfba
2023-03-24 13:12:45 -07:00
Colin Cross
99a26d0bfd
Merge "Don't read test mapping list in Make" am: 2feb102e4d
am: 4979af18b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833
Change-Id: I6bb66b00b8344dafcea5825de2e5a65463d186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:55:11 +00:00
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
4979af18b9
Merge "Don't read test mapping list in Make" am: 2feb102e4d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833
Change-Id: I17d985e486d475539dcb24d01594e47a48d0621f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 16:26:48 +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
2feb102e4d
Merge "Don't read test mapping list in Make"
2023-03-24 15:53:47 +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
Colin Cross
01475b41fb
Don't read test mapping list in Make
...
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed. Pass the file
to the rule and read it during ninja instead.
Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
2023-03-24 04:33:07 +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
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
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
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
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
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