Commit Graph

87306 Commits

Author SHA1 Message Date
Steve Berbary
470e269362 Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I108c76d795a1f0439c28d251454e6179cf9da9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 09:32:11 +00:00
Steve Berbary
70c7201473 Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I20f5017a34ac318c8c92ac6c19558eb252273634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 09:31:42 +00:00
Treehugger Robot
f542087d78 [automerger skipped] Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4 am: f18046a759 am: c1542959c4 -s ours
am skip reason: Merged-In I760355ffb1818e91c02a98473312f9f21c149361 with SHA-1 2e55115ab3 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: I7d33f0c6e9cc430945b9c5e373eb55db32286d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 09:07:33 +00:00
Steve Berbary
c310efa9f1 Update Security String to 2023-07-01 am: 26a7d4bd9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I4ae82a9b16e7c625d33eeca339e012701bb68892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:44:46 +00:00
Treehugger Robot
c1542959c4 Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4 am: f18046a759
Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: Ifac6f44fa90acee2dc61aca822bfc26af2194c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:26:50 +00:00
Treehugger Robot
b80ad7d3cf Merge "Define release flags in starlark instead of make" am: cedf6314bc am: b0845d7c4d am: dc1fef95d9
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: Ic64811d76b201fc79d2beab20faef41b52069c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:02:58 +00:00
Treehugger Robot
f18046a759 Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: I8498d7585e61ac82da96a2c9f7dc75758f714438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:43:14 +00:00
Treehugger Robot
dc1fef95d9 Merge "Define release flags in starlark instead of make" am: cedf6314bc am: b0845d7c4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: I38b4132605a7028be492ca8fa48c875049c4d521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:20:49 +00:00
Treehugger Robot
4d4ffb28f4 Merge "Don't build automatic RROs for tests" 2023-05-18 06:59:24 +00:00
Treehugger Robot
b0845d7c4d Merge "Define release flags in starlark instead of make" am: cedf6314bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: Ibef1aad9331f1dd65ec5a2ebeb27296e8b94abb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 06:16:16 +00:00
Treehugger Robot
cedf6314bc Merge "Define release flags in starlark instead of make" 2023-05-18 05:22:47 +00:00
Colin Cross
a0c5f20cc8 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec am: 86c4177294 am: 3a84a84044
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: Ibe5156bd0241378dcdfd5dc015d3cadafc020343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:13:31 +00:00
Colin Cross
3a84a84044 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec am: 86c4177294
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: I3e69f2f6d157599e68a9d26633cfbf42d5c9da4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:25:25 +00:00
Colin Cross
86c4177294 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: I62801a11f9005090ebfd9866985a87cd6d220f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:41:19 +00:00
Colin Cross
93ff702df2 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
Merged-In: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-18 03:14:01 +00:00
Colin Cross
ede2d8e2ec Merge "Build java fuzz targets with one build target instead of needed a host target and device" 2023-05-18 02:51:43 +00:00
Treehugger Robot
9412209acb Merge "Don't build automatic RROs for tests" into udc-dev am: d6286eefa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23288488

Change-Id: Ic0f314886148c7cbea9cf24d10d55430e10ff357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 23:18:19 +00:00
Treehugger Robot
d6286eefa8 Merge "Don't build automatic RROs for tests" into udc-dev 2023-05-17 22:01:57 +00:00
Treehugger Robot
d714e3d18f Merge "aconfig: Add first iteration of cpp codegen to aconfig" am: 4266df817d am: 97f144f4f7 am: 31804378ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2585679

Change-Id: I4b1204facfd76d1f78b5a2c959f5c7e2f845de82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 21:03:58 +00:00
Wei Li
c2dd3fd0a0 Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f am: 802310c4fd am: 1f8974d7b5
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: Id9060cf165fea3d684fc03eba4957e5517844b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 21:03:43 +00:00
Baligh Uddin
4c9e7690f8 Merge "Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file." am: 82d450e501 am: f04ce4eb36 am: 67884191ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2590485

Change-Id: I49b96f2049220e0f12d9bbaa681ee37ed4003488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 21:03:32 +00:00
Satoshi Futenma
18c83ccacd [automerger skipped] Support custom payload signer in merge_ota am: 6c8f896589 -s ours
am skip reason: Merged-In I3b926b8cd69bc74dff6ccf8b5ccc72bedffcac6f with SHA-1 1f93ce20c5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23289181

Change-Id: If1d2ea183b7387d501156dcf1322d1c19fb6417f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:43:02 +00:00
Treehugger Robot
31804378ca Merge "aconfig: Add first iteration of cpp codegen to aconfig" am: 4266df817d am: 97f144f4f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2585679

Change-Id: I79a3250a17a020c5b44b7323679fab38ec1759e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:20:27 +00:00
Wei Li
1f8974d7b5 Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f am: 802310c4fd
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: I2dd20a7a04cafccdbc64b0ebdedf71d49867b5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:20:08 +00:00
Baligh Uddin
67884191ca Merge "Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file." am: 82d450e501 am: f04ce4eb36
Original change: https://android-review.googlesource.com/c/platform/build/+/2590485

Change-Id: I4dd17aac033cc6d0d109dd41f3d6b19f4fa84247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 20:19:54 +00:00
Jiakai Zhang
0f49bc7d1a Move CLC construction to Ninja phase.
Bug: 282877248
Test: m
Change-Id: Ib87aafcfad09b569e44eed3a5a6c385237a66b55
2023-05-17 21:06:32 +01:00
Treehugger Robot
97f144f4f7 Merge "aconfig: Add first iteration of cpp codegen to aconfig" am: 4266df817d
Original change: https://android-review.googlesource.com/c/platform/build/+/2585679

Change-Id: Ic76387fcc26f48db6417cbf564a450d6acc6a184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:56:49 +00:00
Treehugger Robot
4266df817d Merge "aconfig: Add first iteration of cpp codegen to aconfig" 2023-05-17 19:37:28 +00:00
Wei Li
802310c4fd Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: I0f302bf5cf4e6313aedc836034ccd9111f4ec534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:33:20 +00:00
Baligh Uddin
f04ce4eb36 Merge "Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file." am: 82d450e501
Original change: https://android-review.googlesource.com/c/platform/build/+/2590485

Change-Id: I2b8dace3a3b2f257919c4f2a1ca775d766e0aff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:32:56 +00:00
Wei Li
eb035dc89f Merge "Some changes to support SBOM generation for b build unbundled APEXs." 2023-05-17 19:19:47 +00:00
Cory Barker
4b0112209b Build java fuzz targets with one build target instead of needed a host target and device
(cherry picked from commit 12727fceab)

Test: built locally and verified fuzzers with Jazzer
Change-Id: Icb1ecef1920fa1ba6d4492acdd3b37093964eb84
2023-05-17 19:06:26 +00:00
Baligh Uddin
82d450e501 Merge "Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file." 2023-05-17 18:48:16 +00:00
Colin Cross
2e55115ab3 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Ignore-AOSP-First: high priority build fix
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-17 11:01:19 -07:00
Satoshi Futenma
6c8f896589 Support custom payload signer in merge_ota
Add options to handle custom payload signer as it is required in
merge_ota.py as well if the original OTA packages are signed by
the signer.

If input is only one OTA, clone apex_info.pb to the target.

Use common.ZipWriteStr instead of zipfile.writestr, this ensures
that the same permission for the entries as done by
ota_from_target_files.

Bug: 282189563
Test: manual. pass single OTA to merge_ota, with same signing
    parameters as originally used. Confirm that output zip is
    binary identical to input.
(cherry picked from https://android-review.googlesource.com/q/commit:1f93ce20c5a5f3e7c2f6b5e1f9fdc4d2572220cc)
Merged-In: I3b926b8cd69bc74dff6ccf8b5ccc72bedffcac6f
Change-Id: I3b926b8cd69bc74dff6ccf8b5ccc72bedffcac6f
2023-05-17 17:22:51 +00:00
Daniel Zheng
0d3c15c2ae Add --max_threads to OTA generation
Adding an option to configure max number of threads used during
ota_from_target_files

Bug: 277794445
Test: tested ota_from_target_files
(cherry picked from https://android-review.googlesource.com/q/commit:a30989bafa820faf24eca7e11e48f8f122d7991f)
Merged-In: I9bae92ee43c21926434ab04563a2b4f0678b73eb
Change-Id: I9bae92ee43c21926434ab04563a2b4f0678b73eb
this patch is necessary for partner to improve OTA generation b/277794445
2023-05-17 16:14:05 +00:00
Treehugger Robot
4ba88037d8 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" into udc-dev-plus-aosp 2023-05-17 15:44:58 +00:00
Liz Kammer
f24be9dba9 Add BUILD_BROKEN_PLUGIN_VALIDATION flag
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
2023-05-17 15:44:25 +00:00
Dennis Shen
1dc9ad4662 aconfig: Add first iteration of cpp codegen to aconfig
The general idea to reuse java codegen's very neat tiny template idea.
For generated cpp code, it is in the form of a collection of classes
inside a namespace. The reason we choose a collection of classes rather
than a collection of static functions is because gmock test technology
only supports mocking virtual method.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I9ba00667437ff7c3e147ff2828171fc95528bebf
2023-05-17 14:57:58 +00:00
Anton Hansson
68af924f54 Don't add build ID to version name
There is no clear reason why this should be done, and there is evidence
of it causing confusion & minor problems.

Bug: 186432595
Test: m nothing & grep AppsDefaultVersionName out/soong/soong.variables
Change-Id: I46243b4cfb3b23f2229bc1275c6ee96c1cee01d3
2023-05-17 09:19:11 +00:00
SzuWei Lin
0dce348046 Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 15:35:59 +08:00
SzuWei Lin
fb27c2954f Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 05:02:25 +00:00
Steve Berbary
f210fd9294 Update Security String to 2023-07-05 am: d6c119bfaa am: e4783d4b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: Id8d3d1232770e5e72ed221e10f6f826798e467df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 02:05:39 +00:00
Wei Li
16e7aa3c2e Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file.
Test: CIs
Test: lunch barbet-user && m sbom
Change-Id: Ic8eb42c369de8c94c7977b9631ff4b9084dfef01
2023-05-17 01:38:05 +00:00
Steve Berbary
e4783d4b7a Update Security String to 2023-07-05 am: d6c119bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I32253c6815cc77d3c1a5dea63bde576a8deb900c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:21:05 +00:00
Treehugger Robot
a92d39d993 Merge changes from topic "presubmit-am-375c1d3fc5004c749afee2b2beeeaaa6" into tm-qpr-dev-plus-aosp am: 81d587d74c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I36fb23f32b5206eb13cb65e30b3db0ebae0808c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:20:36 +00:00
Joe Onorato
a4440161f7 Merge "Use the namepace as the java package name in aconfig and call the class "Flags"" am: 7833547153 am: 6ee16caf99 am: 31268dd2da
Original change: https://android-review.googlesource.com/c/platform/build/+/2588271

Change-Id: If4aff1369fbf7da5326e2d912a2193bd1bc179f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:20:28 +00:00
Treehugger Robot
c4a58363ca Merge "Allow source build to be an extracted target_files" am: fce28c1b97 am: e1623bb140 am: 7efa3c09cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2589846

Change-Id: I36bb85b92751bc07cc14d9f1deedc45263bbd54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:20:19 +00:00
Treehugger Robot
bc9c36aaf0 Merge "Note ability to annotate dependencies." am: 787629c95d am: 4e5532a5a1 am: 97fc4f8ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/2592248

Change-Id: Iea9eac3928926fde9459134781e5905071d0dc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:20:10 +00:00
Treehugger Robot
ac7c99f04c Merge "Strip values of soong_config_set calls" am: e5e5642ba5 am: f739318a1a am: a46b724fa1
Original change: https://android-review.googlesource.com/c/platform/build/+/2592246

Change-Id: Id9220bc40ab4d2f08b9b3acc4f9b46f232f02db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:19:41 +00:00