Commit graph

84395 commits

Author SHA1 Message Date
Peter Collingbourne
34fa001f55 Merge "Make kernel prebuilts writable after copying them." am: b327befaae
Original change: https://android-review.googlesource.com/c/platform/build/+/2506189

Change-Id: I5324afbb42bacfd419026a4915c9ab3e330c660f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-01 01:23:28 +00:00
Peter Collingbourne
b327befaae Merge "Make kernel prebuilts writable after copying them." 2023-04-01 00:33:43 +00:00
Alex Buynytskyy
5dfdbe12bc Move adb keys creation to CI-only step.
It's easily automatable build step, but it needs to be done way before
REL to allow enough time for manual key propagation.
As such, moving it to local step.

Bug: 243966946
Test: manual
Change-Id: I979e8500c3c0b768af30dff93c9b73ab998a0151
2023-03-31 22:20:29 +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
fca574ed5e Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" into tm-qpr-dev-plus-aosp 2023-03-31 19:48:47 +00:00
Bob Badour
710e637732 Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" am: 00670e0c03 am: 73536cb8b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2517455

Change-Id: If3f21e68105fccf843012d78dc19027231c41fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:39:21 +00:00
Bob Badour
73536cb8b4 Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" am: 00670e0c03
Original change: https://android-review.googlesource.com/c/platform/build/+/2517455

Change-Id: I0ddc693c398fbb169cb366a8ef07fd3a904095e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 16:57:31 +00:00
Bob Badour
00670e0c03 Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" 2023-03-31 15:56:17 +00:00
Bob Badour
928ee9d9f7 Revert "Updated SBOM generator module to generate JSON spdx utility bill of"
This reverts commit e97adc5db9.

Reason for revert: Roll back until the kernel manifests are updated with the spdx-tools library.

Change-Id: Ib2327862acd928ebcea0f328daecc162b46d2c78
2023-03-31 14:51:36 +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
dc77a78bed Merge "Updated SBOM generator module to generate JSON spdx utility bill of material" am: 09df4c6562 am: 63734a593f
Original change: https://android-review.googlesource.com/c/platform/build/+/2497576

Change-Id: I363ffc954d2659c77ae92e66a83c7971628992f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 09:04:36 +00:00
Treehugger Robot
63734a593f Merge "Updated SBOM generator module to generate JSON spdx utility bill of material" am: 09df4c6562
Original change: https://android-review.googlesource.com/c/platform/build/+/2497576

Change-Id: Ie55ec68a6da847e091ab654c081f8af22d040e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 07:49:32 +00:00
Treehugger Robot
09df4c6562 Merge "Updated SBOM generator module to generate JSON spdx utility bill of material" 2023-03-31 07:05:53 +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
88b9b11bf8 Merge "Create otatools build target with dist" am: a4721a5e6b
Original change: https://android-review.googlesource.com/c/platform/build/+/2515235

Change-Id: I38d66fdf1b1ccfc6569033e6bf8e3b786d47cca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 01:59:26 +00:00
Treehugger Robot
a4721a5e6b Merge "Create otatools build target with dist" 2023-03-31 01:12:45 +00:00
Ibrahim Kanouche
e97adc5db9 Updated SBOM generator module to generate JSON spdx utility bill of
material

Test: m compliance_sbom

Bug: 265472710
Change-Id: Iad9ddbd2abf17ff0b034f1410c55dd99051f7127
2023-03-30 23:34:32 +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
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
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
Paul Duffin
ac6008302e Merge "Prevent enabling prebuilts by default for builds that don't support them" am: 31860f66c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2513775

Change-Id: Ifeae7d0df6a558922041eab73f59895a7514ddae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:26:36 +00:00
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
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
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
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
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
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
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
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
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