Jared Duke
2efa9ddbfc
Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a am: 8cc53f284e am: fccb79eba9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958
Change-Id: I8e6971e7e615a8dbabd8df777e43273a506e6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:01:38 +00:00
Paul Duffin
f54ad07923
Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7 am: ac6008302e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775
Change-Id: I4266087353d2c23f5a6fb7d95c52252b1ec76ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:44:07 +00:00
Dan Albert
9b507330eb
Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e am: 39bca0748a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758
Change-Id: Icb775a6ab8cc08bc2e495c6cc86c87297e8986a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:43:09 +00:00
Dan Albert
bd6fc3785f
Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88 am: 31c62f4c44
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757
Change-Id: I15ea9fa745a8253ba9e18a105c57bf45fc7a23df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:43:06 +00:00
Treehugger Robot
188fdcd405
Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b am: 1045e6e398
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662
Change-Id: I5709d6e7acce11251c3528a968892772126365a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:42:35 +00:00
Jared Duke
fccb79eba9
Merge "Keep methods annotated with @JavascriptInterface" am: f43f66335a am: 8cc53f284e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2510958
Change-Id: Ib3d6e18170ace3bfc66fa1e114800a1b853bb13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:39:30 +00:00
Dan Albert
39bca0748a
Merge changes from topic "fix-api_levels.json" am: 249bc4c034 am: bf5d61971e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509758
Change-Id: Iaf7c7589c30d576f4e48b74243291eadeb96bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:37:03 +00:00
Dan Albert
31c62f4c44
Acknowledge V in AOSP. am: 2549214184 am: a2308ffc88
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2509757
Change-Id: I0e0d48d699ef4d43ba78c576010436debc787162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:37:01 +00:00
Treehugger Robot
1045e6e398
Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662
Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:34:11 +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
Wei Li
e79bf6523b
Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621 am: 5dbbfc4981 am: 3e8a856df0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315
Change-Id: Ic9cd1347661ff888eacd65438da1a5bcc093bfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:41:16 +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
3e8a856df0
Merge "Remove unused make variable BUILDING_PVMFW_IMAGE" am: cf016b9621 am: 5dbbfc4981
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2510315
Change-Id: I0da8ef640c143a06b87f52aafb9faf560523f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:55:32 +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
936ae9add6
Remove unused make variable BUILDING_PVMFW_IMAGE
...
Test: CIs
Change-Id: I56d72c08c1fe5794f8c550651a2805109b70391f
2023-03-29 07:29:54 +00:00
Treehugger Robot
0ff2c84265
Merge "remove reference to old VTS config" am: f0889e28b6 am: 8d1eb1aa3e am: 0a796f6fae
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676
Change-Id: Iee82914888695ed5478967862f872d32c0a2ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 03:53:13 +00:00
Treehugger Robot
0a796f6fae
Merge "remove reference to old VTS config" am: f0889e28b6 am: 8d1eb1aa3e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2503676
Change-Id: I21b936bcabfc8551fdcd85d126a1c84b4f47d77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 03:24:59 +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
Android Build Coastguard Worker
5efdbe14e5
Make change and version bump to TQ2A.230505.001
...
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21959028'] into tm-qpr2-release.
Change-Id: I98599069e3b5c4c52aa84c58b65fc444a00181be
2023-03-28 18:53:24 +00:00
Steve Berbary
7f02771151
Update Security String to 2023-05-05
...
Bug: 272844037
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be772485c3cd1693cedb404114d2d0de4d21e492 )
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-28 18:41:22 +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
Treehugger Robot
80d1b21af4
Merge "Increase dump-words-to-file capacity" am: f8a3ca9f51 am: 95f3ebf3cf am: e5d89d51e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506191
Change-Id: I19e91290065cc2d884c966d774ec2c922b99eeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-25 02:16:51 +00: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
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
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
7d9504703a
Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 am: 99a26d0bfd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833
Change-Id: Iab99c4cbf551f50882504d2df462e124aa76bda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 17:44:18 +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
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
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
d33ef7391f
Merge "Clean additional Robolectric variable" am: 539fbc287e am: 5a678d06ee am: 74aebc8e55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2494869
Change-Id: I5333141e7effa06f75bdda0f7b13d1c275020147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 00:24:21 +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
Sijie Chen
539fbc287e
Merge "Clean additional Robolectric variable"
2023-03-23 22:51:42 +00:00
Spandan Das
8a02633b56
Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c3c am: b9a6afe05a am: 11fbf45243
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2498195
Change-Id: I62e58698f9a9fd511b1f69df5ae019f16976a1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 22:51:11 +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
Spandan Das
0326e64c3c
Merge "Update hardcoded references to android_*stubs_current"
2023-03-23 21:32:03 +00:00
Sunil Ravi
4e19fe52ff
Merge "Add config to skip state toggle off/on for Wi-Fi NAN" am: 691c92f567 am: b25981143f am: 40167b0380
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2503002
Change-Id: Ib68ba885763bf62ead5604e3605b58ed66337d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 21:29:44 +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
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