Commit Graph

86057 Commits

Author SHA1 Message Date
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
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
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
Bob Badour
cf049e9f0e Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" am: 00670e0c03 am: 73536cb8b4 am: 710e637732
Original change: https://android-review.googlesource.com/c/platform/build/+/2517455

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

Change-Id: I6c268817b4cca7cabf11264a20a6936912e5e6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 09:34:20 +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
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
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
Gabriel Biren
3d5b1ba95d Merge "Update generic system makefile to use the AIDL Wifi Vendor HAL." into udc-dev 2023-03-31 01:35:32 +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
Gabriel Biren
1669b364b5 Update generic system makefile to use the
AIDL Wifi Vendor HAL.

Bug: 274964641
Test: Pre-submit tests
Ignore-AOSP-First: AIDL HAL is not in AOSP yet.
Change-Id: Id4af079389d5adf8380431da01a1d7f36bb1510d
2023-03-30 21:09:43 +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
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
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
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
Jiakai Zhang
068c1285f9 Merge "Turn on ART Service." into udc-dev 2023-03-29 16:21:49 +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