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

86485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
3bc1d4b99b Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 am: 1b07bfec46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I55e34ce4dfb725158af0abacd814e8d638d97413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:56:05 +00: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
zhangyongpeng
707569711b Try with search_path for some avb path args 
If we can't find relative signing_helper path, try with the OPTIONS.search_path dir prefix， and integrate the avb_*_key_path for the same logic.

Test: Build && releasetools_test

Signed-off-by: zhangyongpeng <zhangyongpeng@xiaomi.com>
Change-Id: Ifb1096ddea90693668f3344eb242bf9725113d11
 2023-04-14 12:12:47 +08:00
Ibrahim Kanouche
77dd8b7174 Merge "Added validation to SBOM generator" am: 8eed7f5ac6 am: bdc1b58380 am: 5f35c29870 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529120

Change-Id: Iaba3e4dfa1e695ccc7f5a4bc31ab1d2e05d3e06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 01:55:14 +00: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
73f61e7ede Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e am: c129df521c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: I6bce6615763f6e2d5d1fb1faba0f2879a0704b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 20:09:07 +00: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
b05968e183 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b am: f27ff5e616 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I23fa0c10ae08c9b80e93aa051e8f960ffb24fe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 17:30:04 +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
Treehugger Robot
0cf2a44eea Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 am: 858e08e0ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ia479fbc12ef71408892b2078742c691662720d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:15:58 +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
e562055a3f Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 am: 8bf7d62a34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

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

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

Change-Id: I4e0f28e3cd4bd218a7280e6c9a7167419516f775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:57:07 +00:00
Steve Berbary
6617cc455e [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: e163a53b87 -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: I50b8cd417b656db9243d00db4be620ad5549ff54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:53:23 +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
25a7f45e22 [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: 2d5ebe745e -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: Id5455bb27c849a1149abd5bf47bb2715ebcfd697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:49:42 +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
Treehugger Robot
825ec3ea87 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I6f666d0658e1fd5d950242cf0716c766ffd61878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:04:50 +00:00
Steve Berbary
f1c360c071 [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 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: Ie37f772d79cc6bfc08e97c080f71da20293b6ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:03:41 +00:00
Steve Berbary
2d5ebe745e [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 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: If002bc9bed1f6d699fd70d2d0a8f457fe1890331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:02:39 +00:00
Treehugger Robot
91b6a0ca43 Merge "Merge TQ2A.230405.003" am: 09ead5b787 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529415

Change-Id: I6da28784cb149e4d28b5c846cf75fa003614d8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:00:55 +00:00
Steve Berbary
0765119171 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -s ours am: 72b606f500 -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: I3caa288fa0ef58f145893cc76f3be9d681f7b3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 18:28:42 +00:00
Treehugger Robot
2782b82d01 Merge "Remove emulator dependencies on non emulator targets (1)" 2023-04-12 18:13:04 +00:00
Steve Berbary
72b606f500 [automerger skipped] Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 am: 02f67f19fb -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: I5c3f41c5f3a17e6d6e0d2b2492d6f7d2cdfc7e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 17:59:10 +00:00
Steve Berbary
02f67f19fb Update Security String to 2023-06-01 am: 333b59fd7f am: f016d3587c am: 99b46a3371 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555018

Change-Id: I9513c514cd5994f836a4dd45236d319f4fd56ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 17:28:19 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Alex Buynytskyy
5571b6d758 Merge "Switch udc-dev to 'sdk finalized' mode." into udc-dev 2023-04-12 17:18:04 +00:00
Alex Buynytskyy
a89bae363d Switch udc-dev to 'sdk finalized' mode. 
Bug: 243966946
Test: run locally
Change-Id: I46026e5fe0c8442caee277a97d7777ec9631c578
 2023-04-12 10:10:20 -07:00