Ulya Trofimovich
1d3c4ae036
Merge "Revert "Disable dexpreopt for aosp_riscv64""
2023-04-03 11:31:42 +00:00
Inseob Kim
df74fa7504
Remove 28.0 compat support
...
Treble doesn't support U system + P vendor, so removing P (28.0)
prebuilts and compat files.
Bug: 267692547
Test: build
Change-Id: I943a1f70b3600918a375ff62a20d45cfae2f673e
2023-04-03 15:18:28 +09:00
Peter Collingbourne
5c17c38778
Merge "Make kernel prebuilts writable after copying them." am: b327befaae
am: 34fa001f55
am: 101d0c4a79
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189
Change-Id: I943abb51b134871262b85d3eba9124b06b46773a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 02:39:52 +00:00
Peter Collingbourne
101d0c4a79
Merge "Make kernel prebuilts writable after copying them." am: b327befaae
am: 34fa001f55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189
Change-Id: Iae457c184385f6e384520a6bfaf2aa4361974ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 01:54:05 +00:00
Peter Collingbourne
b327befaae
Merge "Make kernel prebuilts writable after copying them."
2023-04-01 00:33:43 +00:00
Vinh Tran
2b2f6685ab
Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var
...
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
Merged-In: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
2023-03-31 17:54:49 -04:00
TreeHugger Robot
a770aad52b
Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" into tm-qpr-dev-plus-aosp am: fca574ed5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22256816
Change-Id: Iaa8c329f1a3d144aacd942489e581dee2793f6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:20:50 +00:00
Vinh Tran
f45a8d6e43
Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var
...
Ignore-AOSP-First: Ignore-AOSP-First: Other CLs in the same topic are internal-only
Test: m nothing
Bug: 267229065
Change-Id: I2d71daa6af97eeb0050e1084b27b03900d2d75ef
2023-03-31 14:29:48 +00:00
Kousik Kumar
3357cf912e
Make sort as part of the inner command
...
It turns out, in Cog workspaces, the order of files returned by "find"
command is inherently non-deterministic (they use an absl::HashMap which
intentionally tries to NOT guarantee sort order). This results in
varying order for the inner variable, which actually causes invalidation
and regeneration of the build graph (I'm guessing when "y" changes in
$(sort $(y)), it causes an invalidation in Make). Hence made the sort a
part of the inner command itself.
Tested: Ran the build with Cog and ensured graph wasn't regenerated
across reruns.
Bug: b/276397558
Change-Id: Ie772572048785793067f74c08ac3994ef6cbaa43
2023-03-31 09:57:01 +00:00
Treehugger Robot
5bd32b231f
Merge "Create otatools build target with dist" am: a4721a5e6b
am: 88b9b11bf8
am: 7cc1967008
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235
Change-Id: I6e49941a91a9a2c0481ead0d5d30c614358efe74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:56:54 +00:00
Treehugger Robot
7cc1967008
Merge "Create otatools build target with dist" am: a4721a5e6b
am: 88b9b11bf8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235
Change-Id: I79167fb274075801ea2717a87fb5f718d67c2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:23:24 +00:00
Treehugger Robot
a4721a5e6b
Merge "Create otatools build target with dist"
2023-03-31 01:12:45 +00:00
Dennis Shen
5acfb9c4c6
Create otatools build target with dist
...
BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
2023-03-30 20:10:17 +00:00
Paul Duffin
3490f88416
Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7
am: ac6008302e
am: f54ad07923
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775
Change-Id: I2b561a2d09d055b9a8641bc2fe5dbb4604716e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:32:19 +00:00
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
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