StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,354 Commits 1 Branch 0 Tags
d0b8fd305b5a765ca180848a1a15a89d8299452b
Commit Graph

84354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Buynytskyy
d0b8fd305b Merge "Finalization script fixes." am: 2ba40b5be6 am: 510ada3933 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I19bbf7043b8869d9b17b102e1dd8182d3d11e605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 16:26:32 +00:00
Alex Buynytskyy
510ada3933 Merge "Finalization script fixes." am: 2ba40b5be6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I58becfef52885d057df9a748518ea7a1ba85c2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 15:57:00 +00:00
Alex Buynytskyy
2ba40b5be6 Merge "Finalization script fixes." 2023-04-17 15:26:16 +00:00
Alex Buynytskyy
f7a5e2fa4b Finalization script fixes. 
- actually do the first step instead of just logging a message,
- make sure extension SDK bump gets picked up by the topic,
- fix the resources_sdk_int in first step, and unfix in the second.

Bug: 278246368
Fixes: 278246368
Test: local run
Change-Id: I0d0f4e2ec7f0b584b9fc14a545cfec73a9fcbdea
 2023-04-16 21:15:18 -07:00
Treehugger Robot
d488ea8f83 Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 am: 42cfbe4f1a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: I623a58bf133b2f869044bb4414d58ba1a0f83d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 21:41:12 +00:00
Treehugger Robot
42cfbe4f1a Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: I9aa503574c3ca689161fdcfe1618ec79821a973a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 21:11:36 +00:00
Treehugger Robot
3fb8d2bad8 Merge "Fix the following issues mentioned in Pixel SBOM review." 2023-04-15 20:34:52 +00:00
Wei Li
5290825452 Fix the following issues mentioned in Pixel SBOM review. 
1) PackageSupplier should be NOASSERTION if there is no homepage
   information in METADATA file of source packages
2) PackageDownloadLocation of upstream packages should be NOASSERTION if
   there is no code repository URL in METADATA file of source packages

Test: CIs
Test: atest --host sbom_writers_test
Change-Id: I8a0298b7bacc2f96555f9d7dde0d21ada8c6b564
 2023-04-15 06:05:32 +00:00
David Anderson
236b709dcd Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I87172391727ae2b8fe4735aa1f7c1c9bef11098c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 06:01:17 +00:00
David Anderson
70e4fa03b7 Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I5c67e68393a2b9b7080c27f9299193486d78a3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 05:31:03 +00:00
David Anderson
23c2df71bc Merge "ota_from_target_files: Disable XOR on <T vendor." 2023-04-15 04:52:46 +00:00
Treehugger Robot
4fdafe37f3 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da am: 78667a4692 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

Change-Id: I2b4cdec89bc9f5ccfc423dd93bef393902a612f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 02:41:44 +00:00
Dennis Song
2e63bdb6d0 Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0 am: e890d0008c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541

Change-Id: I8600fd1e1a057eb53cc803f29620c7e46c329e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 02:41:26 +00:00
Treehugger Robot
78667a4692 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

Change-Id: I315fd1f9274cfda7b45c84b229ca6d6f040aa3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 02:26:07 +00:00
Dennis Song
e890d0008c Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541

Change-Id: I2a38a896019d5f295dc0230f4496d91c31118f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 01:56:21 +00:00
Treehugger Robot
7b640806da Merge "Revert "Remove all ZIP64LIMIT hack"" 2023-04-15 01:48:58 +00:00
Dennis Song
5da012adb0 Merge "Include META/* in the vendor item list when rebuild-sepolicy" 2023-04-15 01:15:44 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 23:55:55 +00:00
Florian Mayer
b98ff26c7d Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd72c47073253b10e45bcddfaaf8e24617dc02b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 23:38:37 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
David Anderson
1c59617820 ota_from_target_files: Disable XOR on <T vendor. 
Bug: N/A
Test: ota_from_target_files
Change-Id: Ia9093a3c3f79d88f98f0777e8a0f8c72741055b8
 2023-04-14 16:01:55 -07:00
Kelvin Zhang
f92f7f046a Revert "Remove all ZIP64LIMIT hack" 
This reverts commit 37a4290909.

Reason for revert: b/278156419

Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
 2023-04-14 21:32:54 +00:00
Treehugger Robot
074bfc1264 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91 am: 28fc5a97a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I1e65b41eedd122d3258270a78168ef2ec83e60c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:23:29 +00:00
Treehugger Robot
1b07bfec46 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: Ia8830c6718644b7239c8b0be629b5bba5518597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:23:19 +00:00
Treehugger Robot
28fc5a97a7 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I547848b6a2eb24acf6f375e759015c2a5188c8bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 20:55:18 +00:00
Treehugger Robot
f4c40a7eb2 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I1cb8e4aca08ea4298c5e832087c088ed958795a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 20:55:03 +00:00
Treehugger Robot
ebf41e9a91 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." 2023-04-14 20:43:58 +00:00
Treehugger Robot
6fb4c8dcee Merge "Order entries in apex_info.pb" 2023-04-14 20:33:18 +00:00
Håkan Kvist
01e381954b Order entries in apex_info.pb 
Adding the entries in apex_info.pb in sorted order makes it easier to
compare ota packages generated between the same source and target on
different computers/environments, ideally the generated ota zips should
be identical.

os.listdir() was used to find the apex files which should be
included in apex_info.pb. listdir() does not guarantee any order,
solution is to sort the result to ensure consistent order.

Bug: 278095305
Test: Manual. Confirm that apex_info.pb is generated sorted
    protoc --decode_raw < apex_info.pb
Change-Id: I2851d207f828a6ac31e63e20c9025965ac4b0eba
 2023-04-14 10:36:04 +02:00
Dennis Song
09f5c5dc0b Include META/* in the vendor item list when rebuild-sepolicy 
To ensure that `AddImagesToTargetFiles` can still be used with
vendor item list that do not specify all of the required META/
files, those files should be included by default.

Test: atest --host releasetools_test
Bug: 278133178
Change-Id: I5a04bfc43d405d6838028f2535ced2124dbd43aa
 2023-04-14 12:13:42 +08:00
Ibrahim Kanouche
5f35c29870 Merge "Added validation to SBOM generator" am: 8eed7f5ac6 am: bdc1b58380 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120

Change-Id: Ib89082c96c8bc70f550c4438d72d26f4fa46374f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 01:24:16 +00:00
Ibrahim Kanouche
bdc1b58380 Merge "Added validation to SBOM generator" am: 8eed7f5ac6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120

Change-Id: Ib7376c124c6be6e16e2eeb4f4b52ca6f9ff3735e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 00:54:39 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images 
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
 2023-04-13 17:39:25 -07:00
Ibrahim Kanouche
8eed7f5ac6 Merge "Added validation to SBOM generator" 2023-04-14 00:19:05 +00:00
Wei Li
dec97b1462 Create separate python libraries for the following logic and refactor SBOM generation script accordingly. 
1) writer classes of generating SBOM in different SPDX formats
2) data classes to model the SBOM structure in SPDX

Bug: 272358880
Test: CIs
Test: build/soong/tests/sbom_test.sh
Test: atest --host sbom_writers_test

Change-Id: I1175cf0d99864bc4304559a59484ef0ba401cd64
 2023-04-13 13:34:57 -07:00
Treehugger Robot
c129df521c Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: Ie5cc79ab5616cb59828b7506f53ca28f0f7e763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 19:04:08 +00:00
Treehugger Robot
29a137ab3e Merge "Make sort as part of the inner command" am: 859d43a1bd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: I7d39b5d56b5b89e55d28032eb486748f80fac9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:31:00 +00:00
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +00:00
Wei Li
f27ff5e616 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I04420fa2bb20743249e515a47a51e2d0dcc87c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 16:43:58 +00:00
Wei Li
96fead867b Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: Ib79306256effee635981c72fef2b62037b5fd362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 16:12:27 +00:00
Ibrahim Kanouche
8c745a436b Added validation to SBOM generator 
Test: m compliance_sbom
Change-Id: I1ff2dfbc48361cfb785c64306112bc687ca51057
 2023-04-13 16:10:12 +00:00
Wei Li
4dfc33e4dd Merge "Copy SBOM files to directory dist/sbom instead of dist/." 2023-04-13 15:36:40 +00:00
Wei Li
c4d0a61ee3 Copy SBOM files to directory dist/sbom instead of dist/. 
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.

Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
 2023-04-13 02:12:32 +00:00
Treehugger Robot
858e08e0ca Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ia20bdef8a788e1a4fbb8facf047c2bf211bd8495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:46:13 +00:00
Treehugger Robot
c4e1d12853 Merge "Fix s to t OTA" am: 64bfc41359 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ie38f034e6ced581e75df4069cc209801a987dd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:25:50 +00:00
Treehugger Robot
64bfc41359 Merge "Fix s to t OTA" 2023-04-13 01:01:57 +00:00
Treehugger Robot
8bf7d62a34 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:27:56 +00:00
Treehugger Robot
3f9a048876 [automerger skipped] Merge "Merge TQ2A.230405.003" am: 09ead5b787 am: 91b6a0ca43 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: I81bd617605ac3918b2c0a55ee18850ce7587ed76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:22:55 +00:00
Steve Berbary
e163a53b87 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours am: 0765119171 -s ours am: f1c360c071 -s ours am: 968189a216 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: I9faa418688871309e40e6f6409825c4f8958b2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:16:48 +00:00
Steve Berbary
968189a216 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -s ours am: 0765119171 -s ours am: f1c360c071 -s ours 
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 8c6ca0a1e6 is already in history

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

Change-Id: Ib46911f05367a2521d2ff72e17eb54cbb23e2b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:47:16 +00:00