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

8164 Commits

Author SHA1 Message Date
Wei Li
233d5b97f8 Some changes to support SBOM generation for b build unbundled APEXs. 
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:fd7e6517d345d3b8d4af12dae345434d968b83b9)
Merged-In: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
 2023-05-19 00:35:20 +00:00
Daniel Zheng
b87d46cb1a Merge "Add --max_threads to OTA generation" into udc-dev 2023-05-18 19:53:12 +00: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
Po Hu
fc3387bb0e Support to merge PREBUILT_IMAGES 
For example, pvmfw.img comes from framework target files package
and dtbo.img comes from vendor target files package.

Bug: 270241811
Test: merge_target_files
Merged-In: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
Change-Id: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
(cherry picked from commit 81c3f4a884)
 2023-05-09 08:38:39 +00:00
Alex Buynytskyy
44395a8138 Mark udc-dev as finalized branch. 
Ignore-AOSP-First: This CL is only meant internal udc-dev at this time.
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: I9920da7605cf6861742607a62222287f0c79b003
 2023-04-26 06:00:24 +00:00
Kelvin Zhang
657af614c6 Fix incremental OTA generation failures 
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723
(cherry picked from https://android-review.googlesource.com/q/commit:ca45d7a85d5eaf09ba8684f09440e8706ab190ca)
Merged-In: Ia0041e2c72c1a57123519c970f6e734194a81cd2
Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
 2023-04-22 02:50:38 +00:00
Treehugger Robot
a774901872 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 am: 6117ec0e8d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Ie83e38188c3521c5a733839e5bb782cc17455862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 03:36:05 +00:00
Treehugger Robot
6117ec0e8d Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Iff7ebf5069833c03ae44e74bd7c67556a5d08f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 02:54:45 +00:00
Treehugger Robot
269248add6 Merge "Cleanup the list of Soong prebuilt module types." 2023-04-21 01:40:01 +00:00
Wei Li
6f407ba0a8 Cleanup the list of Soong prebuilt module types. 
Bug: 272356622
Test: CIs
Change-Id: I4031f0a73f5af1bbf1eb374bcd7d3a19b9609a46
 2023-04-20 14:13:58 -07:00
Treehugger Robot
c30753213c Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b am: 4f600c2a34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Id9d0a79469a15b3ff8149826ef523a155eacb840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:26:53 +00:00
Treehugger Robot
4f600c2a34 Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Ia718bce15427ad03c434f594b004429972623a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:28:01 +00:00
Bob Badour
adaddab362 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa am: 5339380948 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: I884b859011aca8dc2bbdd302160306f7122b550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:47:11 +00:00
Treehugger Robot
ece71703f8 Merge "Allow ota_from_target_file to work entirely on directories" 2023-04-20 15:17:50 +00:00
Bob Badour
5339380948 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: Ic45413e8722599cb96fdcf05761fc3d83914f1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:05:41 +00:00
Wei Li
4f8f32b14f Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 am: b3565b4aa4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I234246245c1c9d63a9c7758d9fab8196e8b8475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 19:34:48 +00:00
Wei Li
b3565b4aa4 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:21:26 +00:00
Bob Badour
ffba21bbae [LSC] Add LOCAL_LICENSE_KINDS to build/make 
Added SPDX-license-identifier-Apache-2.0 to:
  tools/sbom/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I1f8e5fd8e787a4c53bf4caf80a4000d46d0291e4
 2023-04-19 09:48:01 -07:00
Kelvin Zhang
9dbe2ce40f Allow ota_from_target_file to work entirely on directories 
When building android, build system will first zip target_file directory
into a .zip file, and then invoke ota_from_target_files. We
ota_from_target_files can work directly on top of directories, we can
parallelize OTA generation and target_file zipping, making builds
faster.

Bug: 227848550
Bug: 277028723
Test: th
Change-Id: Id72bd7cca708af0e1bae2db754f39b27777cd601
 2023-04-18 17:47:29 -07:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory. 
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
 2023-04-18 15:57:34 -07:00
Treehugger Robot
9362cc8e1c Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 am: 0e04817b44 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I10aaf2dd5d7f68307d081f0f23a5b1a9831f19e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:43:22 +00:00
Treehugger Robot
e9b57353f7 Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf am: e313385cba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: Ib69a5ea56f160307cf9b36c5898545ac6b4c122c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:40:22 +00:00
Treehugger Robot
0e04817b44 Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I01db0c5e3d039df6a61c880d7a1cfeaa8dba7967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:05:20 +00:00
Treehugger Robot
e313385cba Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I10d545710dcdbd4b0c203ae316f72a88cf7d7ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:03:36 +00:00
Treehugger Robot
67ca3c05c7 Merge "Fix duplicate super_empty.img" 2023-04-17 21:19:13 +00:00
Treehugger Robot
b7a45ea13d Merge "Try with search_path for some avb path args" 2023-04-17 20:43:12 +00:00
Alex Buynytskyy
cf2e6a745e Merge "Finalization script fixes." am: 2ba40b5be6 am: 510ada3933 am: d0b8fd305b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I2eae33dc683564b7022194d9e84d0f0c5608aa87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 16:59:18 +00:00
Kelvin Zhang
aecdc18222 Fix duplicate super_empty.img 
When calling add_img_to_target_files twice, super_empty.img will be
written twice, and resulting zip would contain duplicate entries.

Test: th
Bug: 278522974
Change-Id: I2419d0c4f8b04f876a8cc69a1517f59cab94d75d
 2023-04-17 09:52:39 -07:00
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
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
d6ff8ca1c5 Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 am: 42cfbe4f1a am: d488ea8f83 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: Ib1a3f63826d04e16d879c51789e7beca08f5fd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 22:11:17 +00: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
3fb8d2bad8 Merge "Fix the following issues mentioned in Pixel SBOM review." 2023-04-15 20:34:52 +00:00
David Anderson
e78f998ebf Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 am: 236b709dcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I1aaa20e89e874992ba7525da3df7d7cc3175575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 06:49:27 +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
23c2df71bc Merge "ota_from_target_files: Disable XOR on <T vendor." 2023-04-15 04:52:46 +00:00
Treehugger Robot
98145fb730 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da am: 78667a4692 am: 4fdafe37f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

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

Change-Id: I05d7dcd5f78bfc37fbf42cda8db638e369f072cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 03:13:07 +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
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
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
Treehugger Robot
55decf2e29 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91 am: 28fc5a97a7 am: 074bfc1264 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I0391804c0924a64ae58b71e99815cecd6c078309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:56:20 +00:00
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