StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,717 Commits 1 Branch 0 Tags
efe3de784598c08226a0386f81b13fccde63a93c
Commit Graph

86717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Coastguard Worker
8d1f06e915 Version bump to UP1A.230314.003 [core/build_id.mk] 
Change-Id: I0055b7fdc09e2efdb71fda12fd2b23a684b22e67
 2023-03-14 21:48:06 +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
a731bb748b [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: f713347d0f -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: I8e2edf3665b6eb2be0c3a373a817ff44c7ea9ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:21:40 +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
f713347d0f [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: Ia047e25309f8a58b29faadebd9062277740efeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:23:00 +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
Jiakai Zhang
f109ea74c7 Turn on ART Service. 
Bug: 272053358
Test: Presubmit
Change-Id: Ief92fd8bc759e674c7fb2fcec71233c0f3c88946
Ignore-AOSP-First: ART Service is a new feature only in internal.
 2023-03-14 17:45:53 +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
Treehugger Robot
c189bbce54 Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6 am: 90a8a8b81c am: f63e3bcc68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085

Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:28:11 +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
Steve Berbary
48e2c20515 [automerger skipped] Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e am: 877ca9f537 -s ours am: 53afb275c6 -s ours am: a8cb65919d -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: Icc21d31ec90cdb452213d06b9f5a550e9c11cc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 06:33:31 +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
b761628288 [automerger skipped] Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e am: fa8a0ea9ef -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: Iafc9e622bc5558fa9d6e8867db5a777126a971d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 05:22:34 +00:00
Android Build Coastguard Worker
50aa9e05a2 Version bump to UP1A.230314.002 [core/build_id.mk] 
Change-Id: I132a07e1e6740415eaba21320d5a7a1b235ab8a2
 2023-03-14 05:05:49 +00:00
Android Build Coastguard Worker
b448835945 [coastguard skipped] Merge sparse cherrypicks from sparse-9739622-L18700000959090530 into udc-release. 
COASTGUARD_SKIP: I2597b16c16b62591000dfefc66d00bb10d5fe90f

Change-Id: Iabebe6a64d7c3f19142933bc29b4b4039b54356a
 2023-03-14 04:51:06 +00:00
Android Build Coastguard Worker
8e5f3aefae Version bump to UP1A.230309.002.A2 [core/build_id.mk] 
Change-Id: I2597b16c16b62591000dfefc66d00bb10d5fe90f
 2023-03-14 04:44:19 +00:00
Steve Berbary
fa8a0ea9ef 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: I0428ed3835e0c0f151569654133ae406ab5f3c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 04:38:34 +00:00
Android Build Coastguard Worker
3ba3cbfffb [coastguard skipped] Merge sparse cherrypicks from sparse-9721375-L97500000959088096 into udc-release. 
COASTGUARD_SKIP: I23f85ef3a0b824eb907a453405d05c8f069faa62

Change-Id: If91dc967fceedbdf512c4b642dcb134f48842191
 2023-03-14 04:36:28 +00:00
Android Build Coastguard Worker
149582f5c9 Version bump to UP1A.230309.002.A1 [core/build_id.mk] 
Change-Id: I23f85ef3a0b824eb907a453405d05c8f069faa62
 2023-03-14 04:30:45 +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
Android Build Coastguard Worker
116315c65a [coastguard skipped] Merge sparse cherrypicks from sparse-9732119-L84100000959095204 into udc-release. 
COASTGUARD_SKIP: Ifaf68ef3a907ddfeae82669ea1a6cabd41e6b0e8

Change-Id: I70ed9517f6bfe5950fa8811e7d16bb0a23e3cd2c
 2023-03-14 04:20:06 +00:00
Android Build Coastguard Worker
238c321e7e Version bump to UP1A.230313.001.A1 [core/build_id.mk] 
Change-Id: Ifaf68ef3a907ddfeae82669ea1a6cabd41e6b0e8
 2023-03-14 04:13:50 +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
Android Build Coastguard Worker
2eff881625 Make change and version bump to UP1A.230314.001 
Snap for 9735252 from c35935c344 to udc-release

Change-Id: Ie19b55453e1bcfd609c61c76322e93e9c4c9df04
 2023-03-14 03:29:43 +00:00
Steve Berbary
72e9b8675e Update Security String to 2023-05-05 am: be772485c3 am: 072f723276 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028

Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 01:58:16 +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
Kevin Han
21f3289c94 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f am: a27f3cef8b am: db4eccb0b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539

Change-Id: I59fe77902d69477667e0f6165549a58297c59f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:56:18 +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
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
20d6e731bb Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735 am: 21eadd9e7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

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

Change-Id: Ida57382107218ac24e4465dd10888eec738d364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:19 +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
Roberto Gil Del Sol
26aa1b5efb Revert "Bump SDK Extension version to 6" am: 44f6963cb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21982904

Change-Id: I02015578609fa3bc3f3a59670a84ded97acc98da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 17:53:31 +00:00