Cole Faust
d4b4420a14
Merge "Add filegroup of certificates"
2023-04-04 03:58:15 +00:00
Cole Faust
2d42461400
Move PRODUCT_BRAND to module_common.mk
...
So that we don't need to specify it in individual mainline modules
products, which becomes more important after the internal ones only
inherit from the common aosp product as opposed to the arch-specific
ones.
Bug: 249685973
Test: Diff'd the soong.variables files for the module_* products and saw no differences
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211c5c2810e50a1c5d3bca2f1f7942b624fe3abe )
Merged-In: If1733eb193cd3748fb3562d09bfd41651e2480f9
Change-Id: If1733eb193cd3748fb3562d09bfd41651e2480f9
2023-04-03 22:19:00 +00:00
Ulya Trofimovich
72ed6869a4
Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036
am: 86b1dd2b00
am: 33267272ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036
Change-Id: Ie54445d1a99fdb569319c3b31a6d6622f8edb0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 13:08:32 +00:00
Ulya Trofimovich
33267272ab
Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036
am: 86b1dd2b00
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036
Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 12:37:37 +00:00
Ulya Trofimovich
1d3c4ae036
Merge "Revert "Disable dexpreopt for aosp_riscv64""
2023-04-03 11:31:42 +00:00
Cole Faust
bf65a62cb9
Add filegroup of certificates
...
This is needed for bazel to depend on all certificates from a different
package.
Bug: 269577299
Test: See other cl
Change-Id: I4eeb0b892400fa6bd90080c7e10e9fb762d3b7db
2023-04-01 14:48:19 -07:00
Gabriel Biren
3d5b1ba95d
Merge "Update generic system makefile to use the AIDL Wifi Vendor HAL." into udc-dev
2023-03-31 01:35:32 +00:00
Gabriel Biren
1669b364b5
Update generic system makefile to use the
...
AIDL Wifi Vendor HAL.
Bug: 274964641
Test: Pre-submit tests
Ignore-AOSP-First: AIDL HAL is not in AOSP yet.
Change-Id: Id4af079389d5adf8380431da01a1d7f36bb1510d
2023-03-30 21:09:43 +00:00
Jiakai Zhang
068c1285f9
Merge "Turn on ART Service." into udc-dev
2023-03-29 16:21:49 +00:00
Treehugger Robot
5e20b3e0a0
Merge "Retire unused variable" am: b722138c8c
am: a94bf766c4
am: 2f25fda8d1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916
Change-Id: I9c253216842ad9fb7ff64762e4ea81f7f68149bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:40:09 +00:00
Treehugger Robot
2f25fda8d1
Merge "Retire unused variable" am: b722138c8c
am: a94bf766c4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916
Change-Id: Ifbd1767c5f51b6ffdb17ee0f4da358a898e74991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:10:27 +00:00
Treehugger Robot
b722138c8c
Merge "Retire unused variable"
2023-03-28 19:20:52 +00:00
Treehugger Robot
f7a4d3d3fa
Merge "Add the system_dlkm partition to goldfish" am: 7f92721184
am: d75d774230
am: c7edde26db
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155
Change-Id: I30164c8e971677afd65d73d6c58a273a19278cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 17:35:22 +00:00
Treehugger Robot
c7edde26db
Merge "Add the system_dlkm partition to goldfish" am: 7f92721184
am: d75d774230
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155
Change-Id: Ifd700dfe1264070522b8201c87733ca7dbd0fa39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 17:05:59 +00:00
Treehugger Robot
7f92721184
Merge "Add the system_dlkm partition to goldfish"
2023-03-28 16:11:02 +00:00
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
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
Pascal Mütschard
cc5078aba8
Merge "Adds the gpu_counter_producer command." into udc-dev
2023-03-28 12:08:08 +00: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
Pascal Muetschard
eb9dc3e1a0
Adds the gpu_counter_producer command.
...
This is a small binary that will load a GPU vendor provided shared
library called libgpudataproducer.so, look for the "start" symbol in
that library, and call it. This can be used to start the GPU hardware
counter Perfetto producer that will allow tracing of GPU profiling data
via Perfetto.
Test: manual
Bug: b/273907878
Ignore-AOSP-First: change in topic with internal-first project
Change-Id: I450e159c4d4c323ade90ffa46759239a7bcd4aac
2023-03-27 09:29:04 +00:00
Treehugger Robot
fbc99f283c
Merge "Use a better arbitrary target arch for this host-only "device"." am: e07ac36efa
am: f9915e1328
am: 68d2e6408d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506000
Change-Id: I9fad5873493c268df198d5526f46b7a00221e98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 23:30:23 +00: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
e07ac36efa
Merge "Use a better arbitrary target arch for this host-only "device"."
2023-03-24 21:27:15 +00:00
Colin Cross
db6e20d916
Merge changes Id8b48c8c,I3b66304c am: ffda9a5093
am: d0aa18ed07
am: 9ee11cef7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448666
Change-Id: Icf3be9c7c7b6fb6ba0187a023f4750813250497e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 17:41:03 +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
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
Jiakai Zhang
b32ce6f50e
Turn on ART Service.
...
Bug: 272053358
Test: CTS, GTS, Platinum, and full test mapping
(See http://b/272053358#comment9 )
Ignore-AOSP-First: ART Service is a new feature only in internal.
Change-Id: Ide4f81efb021ff05178dd5395fad6091a89cf6da
2023-03-24 10:57:22 +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
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
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
Peter Collingbourne
3f91ff5d47
Merge "cuttlefish: Add a fullmte target."
2023-03-23 21:39:19 +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
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
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
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
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
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
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
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
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
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
Treehugger Robot
782f63fc5c
Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
am: 5c129b5fc7
am: fe599cb1b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705
Change-Id: If57a27659431a2d504b770d8eaf18fa8d60fb5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 04:57:39 +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