Commit Graph

8167 Commits

Author SHA1 Message Date
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
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
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
Wei Li
6f57b6d309 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3 am: edd91aa259
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755

Change-Id: I28f794c3a1686de5bc2fe56cb003dd2a3618cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:28:40 +00:00
Wei Li
82308a21a3 Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" 2023-03-10 06:40:54 +00:00
Android Culprit Assistant
95c3ea8704 Revert "Generate SBOM of the target product in file sbom.spdx in..."
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a).

Change-Id: I4c7d7645ec0c266eb4d591b3089ba02e78da0659
2023-03-10 06:18:03 +00:00
Wei Li
cfd8bb8d8d Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b am: 0939a08e0c
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663

Change-Id: I9a6a9bbf24eb3a70d47220fa80c3d5caabf8c163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 05:22:44 +00:00
Wei Li
4e2aed055b Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-10 04:47:47 +00:00
Rob Seymour
9e52f880b9 Merge "Add test cases for APEX VINTF." am: 578e1bb073 am: 58d63254dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2242995

Change-Id: Ibb3764a362c8b3ea38a9c5d6a8857615e4832166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 01:57:02 +00:00
Wei Li
02797aa70e Generate SBOM of the target product in file sbom.spdx in product out directory.
Test: m sbom
Test: m dist
Bug: 266726655
Change-Id: I6464fa2dc416dea62c5cf688c923d6b496f044f5
2023-03-09 15:27:58 -08:00
Rob Seymour
9492da59e3 Add test cases for APEX VINTF.
Add test cases to cover HAL definition found in embedded APEX.

Bug: 249086047
Test: releasetools_test
Change-Id: I5639b9b800a89164317740f64306ae10bf41343e
2023-03-09 17:00:06 +00:00
Treehugger Robot
2e43b216ed Merge changes I674ad741,I908043ba am: cee4ebf1c3 am: 75b9affb1a
Original change: https://android-review.googlesource.com/c/platform/build/+/2476065

Change-Id: I0a12af6ffe32110fd58996655700ae82a7e204fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:47:45 +00:00
Treehugger Robot
cee4ebf1c3 Merge changes I674ad741,I908043ba
* changes:
  Disable VABC xor if COW isn't compressed
  Fix secondary payload generation
2023-03-08 02:03:33 +00:00
Treehugger Robot
679fe3fc75 Merge "Fix sparse image detection" am: 135eb025f7 am: 5a776518a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2467460

Change-Id: I81a39cdba26ff44df1330fd7593a9f85a739620e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 00:09:29 +00:00
Treehugger Robot
135eb025f7 Merge "Fix sparse image detection" 2023-03-07 23:41:43 +00:00
Kelvin Zhang
88043be8c3 Disable VABC xor if COW isn't compressed
XOR only saves space if COW data is compressed. If compression parameter
is set to none, disable XOR as it does not save anything but still costs
CPU cycles.

Test: th
Change-Id: I674ad74140570ce4740c290d1adb9e9b5a08426e
2023-03-07 14:42:18 -08:00
Kelvin Zhang
49fadf41eb Fix secondary payload generation
Secondary payload is already handled by creating a new instance of
PayloadGenerator, when creating PayloadGenerator for primary payload,
we should not include the OPTIONS.secondary parameter.

Bug: 270100752
Test: ota_from_target_files --include_secondary
Change-Id: I908043bad11aa6d47dc4dc9b61da460fcfa4f0b9
2023-03-07 14:35:42 -08:00
Treehugger Robot
9db5d01725 Merge "Force all temp artifacts to out/dist." am: abfe1fa152 am: 3814dfeb2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2471734

Change-Id: I24c96576415195f5ca0c26f12eee633f27d51b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 17:59:20 +00:00
Alex Buynytskyy
0645253ceb Force all temp artifacts to out/dist.
This way they don't end up in the final build, and will be in a single
predictable place.

+bump the extension SDK version to 7

Bug: 271806061
Test: run locally
Change-Id: Iaf4d918a269cdb7c79a53b7df9592bf8205e0305
2023-03-06 12:59:57 +00:00
Alex Buynytskyy
22a27dd8f0 Merge "Don't stop on bump sdk failures." am: e54084b5d1 am: 9b810df310
Original change: https://android-review.googlesource.com/c/platform/build/+/2467468

Change-Id: I9ad9dbb03de4c4d313439f759ba8a40bb7daf362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:56:23 +00:00
Alex Buynytskyy
375ea3b457 Don't stop on bump sdk failures.
This is a known issue, fix is in progress.

Bug: 243966946
Test: run locally
Change-Id: Iafcfacc61654838bf0f9ca2321461058ca9afa5b
2023-03-02 21:16:48 +00:00
Kelvin Zhang
0452128f09 Fix sparse image detection
Instead of relying on image build flags, check the actual file to
determine if input is sparse image.

Test: th
Change-Id: I6e58603535039eb3c4e799c61ed9f4783f1888dd
2023-03-02 09:42:52 -08:00
Treehugger Robot
34376c15fe Merge "Update GetTargetFilesZipForCustomImagesUpdates zip2zip call" am: d1f79d4e63 am: be165422c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2462953

Change-Id: I7d96ff797dcb10385db0f5a3f147e70930ad979a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:06:45 +00:00
Gregory Montoir
10e0dec463 Update GetTargetFilesZipForCustomImagesUpdates zip2zip call
This changes the generation of the target files with oem images to
operate in two passes. 1/ zip2zip is called without any filespec.
2/ oem images are replaced.

This allows to generate the target-files faster (as entries do not
need to be iterated one by one) and removes the need to escape
special file names.

Bug: 269397842
Change-Id: Ic1cf398b90344e01b2f1658079903d45bcc00b46
2023-03-01 14:44:56 +08:00
Treehugger Robot
32420bb8e1 Merge "Reject SPL downgrade OTAs on release-keys devices" am: b9dd9dd417 am: 923d0cc1b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2457448

Change-Id: I7c21457c3ba16b9f9ed3cf173969c1356881f2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 02:41:03 +00:00
Treehugger Robot
b9dd9dd417 Merge "Reject SPL downgrade OTAs on release-keys devices" 2023-02-24 22:17:01 +00:00
Kelvin Zhang
3d05f68f3a Reject SPL downgrade OTAs on release-keys devices
Test: th
Bug: 270459308
Change-Id: I013324b5b97336366d8e8cbe05e6ade91778b747
2023-02-24 10:50:53 -08:00
Dennis Song
90ceb79e17 Merge "Allow rebuild sepolicy even though the image does not exist." am: 1d35f905fd am: df1cdb8f53
Original change: https://android-review.googlesource.com/c/platform/build/+/2452627

Change-Id: I9acd7ad5945cb0cc07eb50cd7aedbf4a41e4588b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 03:50:04 +00:00
Dennis Song
1d35f905fd Merge "Allow rebuild sepolicy even though the image does not exist." 2023-02-24 02:10:00 +00:00
Alex Buynytskyy
90e10f30b4 Merge "Finalize SDK in CI using local_mode." am: dc7e98b9a1 am: 9cb3477141
Original change: https://android-review.googlesource.com/c/platform/build/+/2448664

Change-Id: I7437db5c33dd34e853275321aaef6ab949b3ba09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:45:43 +00:00
Dennis Song
16d6fe099d Allow rebuild sepolicy even though the image does not exist.
The `--rebuild-sepolicy` option should work when the target
files folder `ODM/` or `VENDOR/` exists. We should not
assume that there is always an image to remove.

Bug: 270529723
Test: m otatools; Create merged builds with rebuild_sepolicy.
Change-Id: I93aeea2cd084fdc7f8179732d77a78bb1d144616
2023-02-23 23:37:42 +08:00
Alex Buynytskyy
775ad5fe2a Finalize SDK in CI using local_mode.
Bug: 260755259
Test: run locally
Change-Id: I72aabbd69865e4648ba01230dd2354431ec2e650
2023-02-23 01:42:48 +00:00
Treehugger Robot
a3f8ca7640 Merge "Refresh the latest script versions + preparation for local mode." am: c28c48b439 am: fbe980bf0c
Original change: https://android-review.googlesource.com/c/platform/build/+/2445702

Change-Id: I34224623650ecf00ba8ed24b4154ba0ef46c4290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 22:47:42 +00:00
Alex Buynytskyy
bdcef7bfb8 Refresh the latest script versions + preparation for local mode.
Bug: 260755259
Test: local run
Change-Id: I45d3651bd4b837e1338535f98d7256ca9b47e089
2023-02-21 04:56:37 +00:00
Vincent Donnefort
f74012fd97 Merge "Fix missing dev nodes in init_boot.img ramdisk" am: 65af9993b3 am: 07738c42b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2442241

Change-Id: I09c97d6d099179f7760a7ab17467d08b19710455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 11:36:17 +00:00
Vincent Donnefort
65af9993b3 Merge "Fix missing dev nodes in init_boot.img ramdisk" 2023-02-20 09:24:04 +00:00
Treehugger Robot
208f01470b Merge "Move final script to the new folder." am: a0c591db0f am: ba02dbd041
Original change: https://android-review.googlesource.com/c/platform/build/+/2444139

Change-Id: I60f4fe13aa04828f7af5e7e5c96994ab72f4e92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 03:23:20 +00:00
Alex Buynytskyy
32ce1381ca Move final script to the new folder.
Bug: 264308911
Test: run locally
Change-Id: Ice954b7d5ff6c1831e9899c9028e8fd6555ab050
2023-02-17 12:51:24 -08:00
Wei Li
b5a9336179 Merge "Tool for generating GTS open-sourced report" am: 4e7daf6546 am: 0237cb30f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2441962

Change-Id: I1af36bdaf20abf2fb009d72d5687f58951abe9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 11:14:02 +00:00
Vincent Donnefort
6e861e9cf8 Fix missing dev nodes in init_boot.img ramdisk
Previously ("Add null and console dev nodes to the Android initramfs")
introduced into init_boot.img the /dev/console and /dev/null nodes.
Sadly, it missed changing the release tools which are also generating
images in their own way.

Bug: 254835242
Change-Id: I4d2893ac24c09cf0d117422cbe2bde66083e7118
2023-02-17 10:52:28 +00:00
Wei Li
4e7daf6546 Merge "Tool for generating GTS open-sourced report" 2023-02-17 09:12:01 +00:00
Treehugger Robot
aa651b93b0 Merge "Use zip2zip to copy zipfiles" am: a59e5b7a29 am: 8c53b320ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2439632

Change-Id: Iec87d556be8d028464c81d377d65241fca254057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 23:55:10 +00:00
Treehugger Robot
a59e5b7a29 Merge "Use zip2zip to copy zipfiles" 2023-02-16 22:18:15 +00:00
Yihan Dong
881461fb90 Tool for generating GTS open-sourced report
The report contains:
1. whether gts-verifier need to be open-sourced
2. gts test modules that need to be open-sourced

Test: m gts
Change-Id: I1ce48f7e612556162d5ce1c76b3168ee7f35f826
Merged-In: I1ce48f7e612556162d5ce1c76b3168ee7f35f826
2023-02-16 21:54:23 +00:00
Treehugger Robot
a0899f4045 Merge "Automate frameworks/libs/modules-utils." am: 98426ec5dc am: e1aeea5c0f
Original change: https://android-review.googlesource.com/c/platform/build/+/2438513

Change-Id: If76985241ef67c1057c1d4c7535527767013fe35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:59:51 +00:00
Kelvin Zhang
c8ff84b219 Use zip2zip to copy zipfiles
ZipDelete() works by copying every non-deleted entry to a new zipfile.
Current implementation uses python's zipfile module to perform entry
copying, which is inefficient, as every entry must be decompressed and
then re-compressed. Instead, use zip2zip which avoid re-compression.

Improvement: deleting META/dynamic_partitions_info.txt from
raven-target_files-9465001.zip improved from 500+ seconds to 13 seconds.

Change-Id: I0548255bc29380303314763f6d81e74bf3dbb76e
2023-02-15 16:55:48 -08:00
Alex Buynytskyy
221c723106 Automate frameworks/libs/modules-utils.
Bug: 264308911
Test: run locally
Change-Id: I3ae27708bee4c940051ec766c875b6ab55577e42
2023-02-15 17:00:58 +00:00
Alex Buynytskyy
c5328baa15 Merge "More finalization script fixes." am: aa055f064e am: 7154ed28c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2433578

Change-Id: I05a2dc43e1db00782077727e3d0e60a52231b310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 07:23:17 +00:00