Commit Graph

85413 Commits

Author SHA1 Message Date
Treehugger Robot
4fac9d776c Merge "Add an automated tools for generating brick OTA package" 2023-03-15 09:24:40 +00:00
Wei Li
90217d9c4c Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a am: 0f06273190
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: Ibdca45c0e2c871c9a7f4c26bfa5d18d825112c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 06:27:44 +00:00
Wei Li
0f06273190 Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: I24efb9909e63c335c54153f3501c04ce2eaaf1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 05:51:30 +00:00
Wei Li
15187b6f1a Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." 2023-03-15 05:20:44 +00:00
Android Build Coastguard Worker
7e226b06d4 Make change and version bump to TQ3A.230315.001
Snap for 9744320 from 53afb275c6 to tm-qpr3-release

Change-Id: I02aad9591182a999f9eb93f45bb2e81c374eafee
2023-03-14 23:59:25 +00:00
Kelvin Zhang
f91d74bd52 Add an automated tools for generating brick OTA package
In the past, we have been generating brick OTA packages manually.
Automate this process.

Bug: 273561331
Test: create_brick_ota --product oriole brick.zip and apply the package
Change-Id: I7f4cf3cacaedd9d376b4cc07cbb388930bca643b
2023-03-14 16:58:36 -07:00
Xin Li
4826379652 [automerger skipped] Merge "Merge Android 13 QPR2" am: eb2ad4b002 -s ours am: b9f34c8e42 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

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

Change-Id: I13492b572b02c148a7c24182e5ec71bebe705c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:08:36 +00:00
Xin Li
d30d753729 [automerger skipped] Merge Android 13 QPR2 am: 48ba26b496 -s ours am: 51161f4d38 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

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

Change-Id: I7d6f62e1b672b13b88b2f44eb189b893ec31201c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:16 +00:00
Prashanth Swaminathan
06713a0e89 Disable frameworks loading of renderscript libs
Bug: 206676167
Test: Verified during boot that frameworks skips loading of rs_jni by
injecting logs into frameworks/base/rs.

Change-Id: I856367df816c8ad28dde54af69ab36e4f1605146
2023-03-14 15:52:54 -07:00
Xin Li
b9f34c8e42 [automerger skipped] Merge "Merge Android 13 QPR2" am: eb2ad4b002 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

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

Change-Id: I7d153e8a1eff2277488a54aabea047b1c809d59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:34:42 +00:00
Xin Li
51161f4d38 [automerger skipped] Merge Android 13 QPR2 am: 48ba26b496 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

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

Change-Id: Ic45f7b88fb4ad8bd39ff2a5477e963831d3bcaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:25 +00:00
Wei Li
499333616c Generate SBOM of the target product in file sbom.spdx.json in product out directory.
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".

The feature will be enabled later in small CLs after running tests successfully in forrest.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
2023-03-14 15:14:06 -07:00
Steve Berbary
40f22316a3 [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours am: b77d990efa -s ours am: ff3bc8bedf -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: If2ba7952c8936f21c44576069d3ddf41ae62b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:00:28 +00:00
Xin Li
eb2ad4b002 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:46 +00:00
Steve Berbary
ff3bc8bedf [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours am: b77d990efa -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: I5b1d296153601b2802ca148b2137d956fc9a32cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:24:44 +00:00
Steve Berbary
b77d990efa [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: I01a359a0cbd8f5e2e35f3f45c60010a8bcd6ca52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:23:42 +00:00
Steve Berbary
4c14c3f28d [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: I0d7ce6bc3900bdaeedef719e4f14ff8e2e3b0262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:42:19 +00:00
Steve Berbary
f60d4fdf67 [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: Ifffb57e6dcab29f0c18dd9d82254dd0938774e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:05:09 +00:00
Steve Berbary
2c4dad8ca3 Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:23:46 +00:00
Android Build Coastguard Worker
11891d6053 [coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L31500000959114895 into tm-qpr2-release.
COASTGUARD_SKIP: I99f7429f4b7ead2be23ec1ace7c7ba4a6df1141e

Change-Id: I9ac27c5bfde2b7164d7b7e1ffd6a8c82bd48a249
2023-03-14 17:54:44 +00:00
Android Build Coastguard Worker
d1947163c6 Version bump to TQ2A.230405.003.B1 [core/build_id.mk]
Change-Id: I99f7429f4b7ead2be23ec1ace7c7ba4a6df1141e
2023-03-14 17:48:14 +00:00
Steve Berbary
07c703d53d Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:44:19 +00:00
Steve Berbary
eaaa30b619 Update Security String to 2023-05-01 am: 6a3344db86
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:09:15 +00:00
Treehugger Robot
f63e3bcc68 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6 Merge "add make_erofs to otatools to support erofs apex" 2023-03-14 15:47:05 +00:00
Xin Li
48ba26b496 Merge Android 13 QPR2
Bug: 273316506
Merged-In: I20a857714f506097c06cf8168b7ec368a3117612
Change-Id: Ib561d8940f172dae085b9b6e9010ecdaba83a661
2023-03-13 23:09:04 -07:00
Steve Berbary
a8cb65919d [automerger skipped] Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e am: 877ca9f537 -s ours am: 53afb275c6 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3 is already in history

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

Change-Id: Id94216fb6b7b1e2ee12b6e785365a3b43247f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 05:58:05 +00:00
Steve Berbary
53afb275c6 [automerger skipped] Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e am: 877ca9f537 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3 is already in history

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

Change-Id: Ia061e9f9d2e67a0f5615bc6249575e49f38f8be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 05:24:56 +00:00
Steve Berbary
877ca9f537 Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e Update Security String to 2023-05-01 am: 2130534b73
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 03:50:29 +00:00
Steve Berbary
072f723276 Update Security String to 2023-05-05 am: be772485c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 01:17:35 +00:00
Android Build Coastguard Worker
310d5a7d07 Make change and version bump to TQ3A.230314.001
Snap for 9736625 from ba7be1ebca to tm-qpr3-release

Change-Id: I98bc60bfc47ffdfecba17c9a83d7f556ad0641c3
2023-03-14 00:00:21 +00:00
Kevin Han
db4eccb0b2 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: Icda5099833a520be40518aad9fd61d962e4e0707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 22:03:01 +00:00
Kevin Han
a27f3cef8b Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I6a2405ac28898643a070616d7da3d5f49df9a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 21:28:45 +00:00
Kevin Han
afb2495f6f Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-13 21:03:22 +00:00
Android Build Coastguard Worker
a7ee9df00d Version bump to TQ3A.230313.002 [core/build_id.mk]
Change-Id: I3d882c563c86f38ce6804fab723a5a77b7c659cf
2023-03-13 20:59:53 +00:00
Kevin Han
161d711d4d Revert "Generate SBOM of the target product in file sbom.spdx in..."
Revert submission 2481062-sbom

Reason for revert: b/273332655

Reverted changes: /q/submissionid:2481062-sbom

Change-Id: Ie8a73d8dc50592204acd489482e0e9d96ffbd5df
2023-03-13 20:57:37 +00:00
Treehugger Robot
21eadd9e7a Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:07:09 +00:00
Wei Li
4534fbc056 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957 am: 1f2ba11661
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: Ied7c1b2f563a957ba73b7d076311caf22db80853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 19:06:00 +00:00
Treehugger Robot
50aeb8e735 Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: I2a6d4a7a9018fbbd580088ed16efc6c8cee80c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:35:20 +00:00
Wei Li
1f2ba11661 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062

Change-Id: I3410bc5aef8a08df8c707733d4f2addd61087868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 18:33:30 +00:00
Treehugger Robot
909a5b40a6 Merge "Update art-host-tests build rule to support partial download" 2023-03-13 17:54:01 +00:00
Wei Li
27d32b0957 Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-13 17:43:59 +00:00
Wei Li
88ac7ae7df Generate SBOM of the target product in file sbom.spdx in product out directory.
Original aosp/2374663 was reverted, try to submit it again with some fixes in this.

Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: Icf305770473f0c448a1ad721cbe7addf737115e4
2023-03-13 17:38:04 +00:00
Android Build Coastguard Worker
84d2191fc3 Make change and version bump to TQ3A.230313.001
Snap for 9731827 from ba7be1ebca to tm-qpr3-release

Change-Id: I83cddaff0cdfbbfb274c6d5ec77889315c44ef77
2023-03-12 21:59:46 +00:00
Android Build Coastguard Worker
f63ed042ab Make change and version bump to TQ3A.230312.001
Snap for 9730367 from ba7be1ebca to tm-qpr3-release

Change-Id: I01c308ed9fc741da8b00fc60f07225e91e6967ab
2023-03-11 23:01:50 +00:00
Android Build Coastguard Worker
5e8a637c5c Make change and version bump to TQ3A.230311.001
Snap for 9727520 from ba7be1ebca to tm-qpr3-release

Change-Id: I1633789447462e0c37fbd1c76f675b0020891c5f
2023-03-11 03:02:17 +00:00
Steve Berbary
6a3344db86 Update Security String to 2023-05-01
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:52:03 +00:00
Steve Berbary
2130534b73 Update Security String to 2023-05-01
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:50:50 +00:00