Commit graph

83939 commits

Author SHA1 Message Date
Jared Duke
8cc53f284e Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958

Change-Id: Ica553fa8e77462113b1079a72913b6c22fed4953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:21:59 +00:00
Dan Albert
bf5d61971e Merge changes from topic "fix-api_levels.json" am: 249bc4c034
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758

Change-Id: Iffef487ed52908e49255a7d22e944b0650937c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:13:23 +00:00
Dan Albert
a2308ffc88 Acknowledge V in AOSP. am: 2549214184
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757

Change-Id: Ic239277f7551ed8a8912a64c0fa8693db4cb2e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:13:19 +00:00
Treehugger Robot
2e5dfd6a0b Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: I4d9922dc3d31f3d025045954226975aac66d223d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:02:33 +00:00
Paul Duffin
31860f66c7 Merge "Prevent enabling prebuilts by default for builds that don't support them" 2023-03-30 15:29:35 +00:00
Jared Duke
f43f66335a Merge "Keep methods annotated with @JavascriptInterface" 2023-03-29 22:24:00 +00:00
Dan Albert
249bc4c034 Merge changes from topic "fix-api_levels.json"
* changes:
  Separate active codenames and preview codenames.
  Acknowledge V in AOSP.
2023-03-29 17:57:22 +00:00
Treehugger Robot
d67a345f9a Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" 2023-03-29 17:04:37 +00:00
Wei Li
5dbbfc4981 Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315

Change-Id: If533ac00f70fd1f898a6c7cb96593a5571f5234a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:27:25 +00:00
Dario Freni
92345a1cdb Prevent enabling prebuilts by default for builds that don't support them
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7b5e2c0cea30dd084536bdc68dffdfb1c50073d)

This uses a completely separate Change-Id as the previous change was
applied to lots of downstream branches (so they contain the Change-Id
as far as the automerger is concernd) but the change got discarded due
to some merge issues. Using the previous Change-Id would cause
confusion. The title of this change was also updated as the previous
title only made sense within the larger topic to which it belonged.

Bug: 230478310
Bug: 223592962
Test: presubmit
Change-Id: Ie35ff34f4626070d1a3fe0bb3a6a999a596d0078
2023-03-29 17:11:50 +01:00
Wei Li
cf016b9621 Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" 2023-03-29 15:54:47 +00:00
Wei Li
936ae9add6 Remove unused make variable BUILDING_PVMFW_IMAGE
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
2023-03-29 07:29:54 +00:00
Treehugger Robot
8d1eb1aa3e Merge "remove reference to old VTS config" am: f0889e28b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676

Change-Id: Iaa67b25f118bb4bac3e2d16ab551498bfc5eed77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 02:56:43 +00:00
Treehugger Robot
f0889e28b6 Merge "remove reference to old VTS config" 2023-03-29 02:23:10 +00:00
Dan Albert
2549214184 Acknowledge V in AOSP.
Development of V APIs has started, so we need to add the codename to
the build system so API developers can use it.

Bug: None
Test: treehugger
Change-Id: Ic7e77cbc9992d7a0d2959abc42ce2862232317ca
2023-03-28 23:25:45 +00:00
Dan Albert
4d24cbd044 Separate active codenames and preview codenames.
Using PLATFORM_VERSION_ALL_CODENAMES (which is a bad name for
historical reasons) for discovering preview API levels doesn't work in
the narrow window where the branch's development is not for the latest
release. Create a second variable for preview codenames and expose it
to soong.

Bug: None
Test: None
Change-Id: I8c271c1d646ea8285553614c6bca944227a0e643
2023-03-28 23:25:45 +00:00
Jared Duke
cc28b02f77 Keep methods annotated with @JavascriptInterface
This rule is a common default rule elsewhere, and should be applied
globally for platform targets rather than relying on per-target rules.

Follow-up work will remove duplicated rules from individual targets.

Bug: 248580093
Test: m
Change-Id: If3cb9fb22d2acf90d87f150f93ad491549bf9090
2023-03-28 14:14:56 -07:00
Treehugger Robot
a94bf766c4 Merge "Retire unused variable" am: b722138c8c
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916

Change-Id: I10aecbd8af96a2e7e4da94180628fc4b3292a446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:42:02 +00:00
Treehugger Robot
b722138c8c Merge "Retire unused variable" 2023-03-28 19:20:52 +00:00
Treehugger Robot
d75d774230 Merge "Add the system_dlkm partition to goldfish" am: 7f92721184
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155

Change-Id: I6e9dc171714887f19845f660c98314205410ec8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:38:10 +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
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
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
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
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
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
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
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
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
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