Commit graph

8316 commits

Author SHA1 Message Date
Cole Faust
f8dfc30a5f Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I7131ed35efe0634b4e28fb4a2c8edeb95d2c12b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:55:03 +00:00
Cole Faust
d4b4420a14 Merge "Add filegroup of certificates" 2023-04-04 03:58:15 +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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
0a70a53cc9 Merge "Disable frameworks loading of renderscript libs" 2023-03-21 03:27:53 +00:00
Peter Collingbourne
e5373c702c cuttlefish: Add a fullmte target.
Bug: 273575148
Change-Id: I3f6a4a3516a44b44e83a50475fbd820ddd1a2f08
2023-03-16 13:53:29 -07:00
Prashanth Swaminathan
06713a0e89 Disable frameworks loading of renderscript libs
Bug: 206676167
Test: Verified during boot that frameworks skips loading of rs_jni by
injecting logs into frameworks/base/rs.

Change-Id: I856367df816c8ad28dde54af69ab36e4f1605146
2023-03-14 15:52:54 -07:00
Hsiu-Chang Chen
5fb8444e85 wlan: Update the path of wpa_supplicant_8_lib am: ba7be1ebca
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21809124

Change-Id: I8752d4947e4549190b2bbb87f4fc3bd78b911dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:09:47 +00:00
Hsiu-Chang Chen
ba7be1ebca wlan: Update the path of wpa_supplicant_8_lib
Add the default path back for backward compatibility

Bug: 271240400
Test: Build Pass
Change-Id: I0cbf7d29984bf99a01dbab39df9ff565aa6f0e55
Ignore-AOSP-First: changes in topics with internal-first
2023-03-08 00:40:39 +00:00
Joe Onorato
a29a46050a Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: I5e369235fae2ca61361873f95712dcb9d2d83570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:02:37 +00:00
Joe Onorato
10bdfb5f23 Merge "Remove OWNERS access for non-build team people to core build system" 2023-02-28 21:27:22 +00:00
Treehugger Robot
397d52d12c Merge "Add libclang_rt.ubsan_standalone to all debug builds" am: 021e31623d
Original change: https://android-review.googlesource.com/c/platform/build/+/2458948

Change-Id: I5ded6c02863415ccf553ddcf4f64cdfebf392d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:04:32 +00:00
Treehugger Robot
021e31623d Merge "Add libclang_rt.ubsan_standalone to all debug builds" 2023-02-28 20:27:48 +00:00
Joe Onorato
682f36220b Remove OWNERS access for non-build team people to core build system
Test: treehugger
Change-Id: I578a2902b6d0853fffe4c3513322da4c15300513
2023-02-28 10:52:10 -08:00
Erick Alvarez
e6ff3ed647 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275
Original change: https://android-review.googlesource.com/c/platform/build/+/2458952

Change-Id: I3f8601eab485d89375640e65afc1e0674feb9bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 23:19:27 +00:00
Erick Alvarez
2b8cf0e409 Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
2023-02-27 20:39:14 +00:00
Florian Mayer
f9d1c1b714 Add libclang_rt.ubsan_standalone to all debug builds
This is needed to run tests that use `sanitize: { undefined: true }`.

(this is a cherry-pick of fc6f2a43af)

Test: run test that needs ubsan on cf_x86_64_phone
      without this change: fails to link
      with this change: works
Bug: 255414852
Merged-In: Id5d3be9bafcc4dbaaf59ca55728ffc40b5cc4af5
Change-Id: Id5d3be9bafcc4dbaaf59ca55728ffc40b5cc4af5
2023-02-27 10:41:53 -08:00
Ulya Trofimovich
18a94331ca Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f
Original change: https://android-review.googlesource.com/c/platform/build/+/2450642

Change-Id: I8e96a2f0098577f1bcddadb413ed2f4fc2f33bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 12:15:00 +00:00
Ulya Trafimovich
e325f61525 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: trehugger
Change-Id: Ib84f1b40675783d286f4ff89d3c1daa9c7be710a
2023-02-24 14:09:10 +00:00
Ulya Trofimovich
10f6bf0169 Merge "Add ART and some other modules to dist target on riscv64." am: b9828d64b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2450643

Change-Id: I7a93db28dcd6bcc64df2a6e616531e8c343ff68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:14:31 +00:00
Ulya Trafimovich
0da6e01bab Add ART and some other modules to dist target on riscv64.
Test: lunch aosp_riscv64-userdebug && m dist
Change-Id: Ib294f30dabeef6cf585ec0e2ad4f51fdfb7f73c4
2023-02-22 13:36:57 +00:00