Commit graph

75779 commits

Author SHA1 Message Date
Sasha Smundak
18e6cbf289 Fix is-board-vendor-qcom: do not return a string consisting of whitespace.
Bug: 201477826
Test: treehugger
Change-Id: I3a830f07975d59802ed9fd4467a176a86672ba3e
2022-02-27 18:14:14 -08:00
Treehugger Robot
4d083132f9 Merge "Ignore cleanup errors." am: afe0e76c28
Original change: https://android-review.googlesource.com/c/platform/build/+/2000465

Change-Id: I455774c1e67b2d22eb21b5f9b2ce7076cbfb2bb2
2022-02-26 06:20:17 +00:00
Treehugger Robot
afe0e76c28 Merge "Ignore cleanup errors." 2022-02-26 05:54:13 +00:00
Baligh Uddin
be2d7d0ce1 Ignore cleanup errors.
Certain binaries may have restrictive permissions.

BUG: 221492085
Test: TH
Change-Id: I56f3c172d9e2c3947e513bdf0b2072457061c547
2022-02-26 02:35:25 +00:00
Cole Faust
beb515cfec Merge "Make product config handles into structs" am: 8fa04e25a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2000190

Change-Id: I575240cb3f9dde478f4528edf40555e672a13e45
2022-02-25 23:29:23 +00:00
Cole Faust
8fa04e25a3 Merge "Make product config handles into structs" 2022-02-25 23:10:31 +00:00
Cole Faust
fbbfbc4723 Add ART_MODULE_BUILD_FROM_SOURCE to control the equivalent soong config variable
When product configuration is converted to Starlark, soong config variables
will be stored in a dictionary and won't be able to be specified directly
on the command line. Add a regular variable that controls the soong config
variable.

Bug: 220940864
Test: Presubmits
Change-Id: Icb6b0c33ea6826ebd8c2ce615dc643eedb9c35a3
2022-02-25 12:39:11 -08:00
Tianjie Xu
9c27ebcbfe Merge "Update owner" am: 42b91dcb79
Original change: https://android-review.googlesource.com/c/platform/build/+/2000493

Change-Id: I74d6901314b67bfa554120021a3af8a6970e5c59
2022-02-25 20:08:59 +00:00
Tianjie Xu
42b91dcb79 Merge "Update owner" 2022-02-25 19:42:10 +00:00
Tianjie Xu
45714a047e Update owner
Change-Id: I11931bcc51408db3ea8d75db67691ee3eb6e0194
Test: N/A
2022-02-25 19:21:48 +00:00
Treehugger Robot
67ce808a50 Merge "Remove ostensibly unused host tools notice." am: 1420aa099a
Original change: https://android-review.googlesource.com/c/platform/build/+/2000192

Change-Id: I7a39d4f3cd5fa70159770e53e8f30567f43b1357
2022-02-25 18:58:51 +00:00
Treehugger Robot
1420aa099a Merge "Remove ostensibly unused host tools notice." 2022-02-25 18:30:02 +00:00
Jooyung Han
474339443f Merge "Replace pvmfw embedded public key" am: 4d0af554ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1990892

Change-Id: Ia2e1f2aa8553828236486d8013b8a4f537a287bb
2022-02-25 07:07:20 +00:00
Jooyung Han
4d0af554ce Merge "Replace pvmfw embedded public key" 2022-02-25 06:39:20 +00:00
Treehugger Robot
5547a546d5 Merge "Fix ota_from_target_files error in non-AB VF" am: bc5a49b504
Original change: https://android-review.googlesource.com/c/platform/build/+/1996191

Change-Id: Ic703cc0bcf10af9b0f7337c6ad34d9579422ca6a
2022-02-25 03:11:12 +00:00
Treehugger Robot
9a983d7aa1 Merge "Add supported variants to module-info" am: b2d71c9b88
Original change: https://android-review.googlesource.com/c/platform/build/+/1991770

Change-Id: I226e279db8303f54419858713e2ccabc182cc524
2022-02-25 03:10:50 +00:00
Treehugger Robot
bc5a49b504 Merge "Fix ota_from_target_files error in non-AB VF" 2022-02-25 03:03:17 +00:00
Treehugger Robot
b2d71c9b88 Merge "Add supported variants to module-info" 2022-02-25 02:44:49 +00:00
Bob Badour
e0eb7e8e38 Remove ostensibly unused host tools notice.
Bug: 151177513

Test: m nothing reportmissinglicenses

Change-Id: Ia33d024bca5262a983b031c2751e7a14c501236e
2022-02-24 18:36:12 -08:00
yangbill
b2219c7052 Add supported variants to module-info
Export the list of variants (host, host_cross, device) a build module
supports to module-info for downstream tools. The values correspond to
the Soong `host_supported`, `host_cross_supported`, and `device_supported`
attribute values.

Bug: 220263783
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I10ae6ea21791d0d100686dcabecbce543a9adc3f
2022-02-25 01:28:51 +00:00
Treehugger Robot
f5d885e873 Merge "Remove catch + sys.exit idiom" am: 14ec6f4157
Original change: https://android-review.googlesource.com/c/platform/build/+/1991316

Change-Id: I61a9033086d23b2ac6eb20c7ee8a822031633dd4
2022-02-25 01:03:27 +00:00
Treehugger Robot
14ec6f4157 Merge "Remove catch + sys.exit idiom" 2022-02-25 00:35:45 +00:00
Cole Faust
9ba0734d4c Make product config handles into structs
This is clearer and allows us to more easily
add new fields to the struct. One usecase for
more fields is the artifact path requirements.

Bug: 221312707
Test: Verified starlark product config still works for aosp_arm64
Change-Id: I4c4307e916f3b3fc8ca303b10eac3c7c73b76ac6
2022-02-24 16:02:59 -08:00
Yi-Yo Chiang
24da1a43bb releasetools: Update T GKI certification scheme
Companion change of I143680b1cab50a6915df56c8273f8741beaf1180.
Basically does the same thing as the other change.

Bug: 211741246
Test: m dist
Test: ./boot_signature_info.sh boot-5.10.img
Change-Id: I40c4d5866c74a9a2d525f9455969b8a71f22bdbb
2022-02-24 21:50:18 +08:00
Yi-Yo Chiang
2f7a108bf2 Update T GKI certification scheme
* Remove 'generic_ramdisk' certification, as we are not certifying
  'init_boot' anymore.
* Add a new 'boot' certificate that certifies the whole boot.img.
* The new 'boot' & existing 'generic_kernel' certificates are directly
  appended at the end of the boot.img, and the mkbootimg
  --boot_signature argument is removed.

Bug: 211741246
Test: m bootimage
Test: ./boot_signature_info.sh boot-5.10.img
Change-Id: I143680b1cab50a6915df56c8273f8741beaf1180
2022-02-24 21:47:51 +08:00
Treehugger Robot
bebf7dc7c0 Merge "Change how we set ro.product.first_api_level." am: 0835ac67b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1992237

Change-Id: I893dd20e4b019f744576bb585b039dc7ba42396e
2022-02-23 21:20:10 +00:00
Treehugger Robot
0835ac67b6 Merge "Change how we set ro.product.first_api_level." 2022-02-23 20:49:14 +00:00
Liz Kammer
4065e5b268 Introduce BUILD_BROKEN_INPUT_DIR_MODULES
Allows allowlisting modules that can temporarily continue to use a
directory as an input while some module types restrict their allowed
inputs.

Test: CI
Change-Id: Ic968a6f6efad45b6c1095dd214813e326d7493c1
2022-02-23 13:59:19 -05:00
Anton Hansson
06c347653c Merge "Add an ndk product and device" am: e9d3c2e85a
Original change: https://android-review.googlesource.com/c/platform/build/+/1990890

Change-Id: I9b19c3561696755dea1e9ffcff8a6d814cffc30f
2022-02-23 18:55:33 +00:00
Anton Hansson
e9d3c2e85a Merge "Add an ndk product and device" 2022-02-23 18:31:44 +00:00
Melisa Carranza Zúñiga
5a0d81a0be Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1982226

Change-Id: Ic0d0b011ca49b8ca7dfafc3c244691ec979afa23
2022-02-23 16:49:13 +00:00
Treehugger Robot
fb9c2f2205 Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: Id64f88237751ec5ab52f12189fd6a0c3553e8eba
2022-02-23 16:36:29 +00:00
Melisa Carranza Zúñiga
77c1dfa6d9 Merge "Adding flags and logic to sign updateable SEPolicy in APEX" 2022-02-23 16:36:16 +00:00
Andrew Scull
bbc930b008 Replace pvmfw embedded public key
The virt APEX payload public key needs to be embedded in pvmfw so that
is verifies the right set of images. As things are being resigned,
update that embedded key so that it matches the APEX.

Bug: 220018566
Test: sign_target_files_apks
Change-Id: I09be91275ec1d1aa6f921c54a96c5159571ddead
2022-02-23 16:27:57 +00:00
Anton Hansson
3327b9fc79 Add an ndk product and device
This adds a product that generates a soong.variables config similar to
the one manually maintained for the ndk build at the moment.

Bug: 174315599
Test: TARGET_PRODUCT=ndk m nothing && inspect out/soong/soong.variables
Change-Id: Ia10079b8a1ed8edf4efa2a6a5b04a079eece5360
2022-02-23 13:25:59 +00:00
Po Hu
760de672c7 Fix ota_from_target_files error in non-AB VF
Add recovery-from-boot.p for device with
BOARD_USES_FULL_RECOVERY_IMAGE disabled

Bug: 219871887
Change-Id: Id4bafaa44afe28f57e0a35846012073307965940
Test: Used to merge non-AB VF device
2022-02-23 07:29:24 +00:00
Treehugger Robot
3f852994b4 Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" 2022-02-23 02:44:45 +00:00
Anton Hansson
36089e0ea0 Merge "Pass the base sdk extension version to soong" am: 15ecbb0810
Original change: https://android-review.googlesource.com/c/platform/build/+/1989155

Change-Id: I75b08a9d8c70eef7ab6776398935675613122a73
2022-02-22 14:10:16 +00:00
Anton Hansson
15ecbb0810 Merge "Pass the base sdk extension version to soong" 2022-02-22 13:46:47 +00:00
Bowgo Tsai
8c7f820512 Adding BOOT_OS_VERSION for the AVB prop in a boot.img
Devices using a prebuilt boot.img, e.g., a GKI, will re-sign
the boot.img to append AVB footers. Currently the value of
"com.android.build.boot.os_version" in the AVB footer is set
to the Android platform version. However, the GKI image might
be from another release branch, e.g., using a Android12-5.10
GKI in a Android 13 codebase.

Adding BOOT_OS_VERSION to allow specify the value separately.

Bug: 211364958
Test: make, then `avbtool info_image --image $OUT/boot.img`.
Change-Id: I335cc7b6c5a455d566f364df6a7dae79facc7a87
2022-02-22 15:00:22 +08:00
Peter Collingbourne
0e3b095886 Change how we set ro.product.first_api_level.
The goal of this change is to cause ro.product.first_api_level to be
set in /system/build.prop in targets with PRODUCT_FULL_TREBLE=false
(which may be the case for targets without the usual set of
hardware interfaces, such as the mini targets being added in
https://r.android.com/1966051).

Setting ro.product.first_api_level is necessary for devices with newer
kernels to boot because it controls which metadata encryption format
is used, and an old format that is incompatible with new kernels is
used by default (see commit 4073c0b5241b635cb59e9e8a75ddcc783b5a99ce in
system/vold). There also appear to be e.g. bionic tests that check this
property. So it seems reasonable to set it even if PRODUCT_FULL_TREBLE
is false.

To begin with, stop adding it to ADDITIONAL_SYSTEM_PROPERTIES. There's
basically no point in adding it there because it will be filtered
out by the property blocklist for the system partition, whether
PRODUCT_FULL_TREBLE is true or false. This lets us remove the
blocklist entry, which causes ro.product.first_api_level to
appear in /system/build.prop via ADDITIONAL_VENDOR_PROPERTIES on
PRODUCT_FULL_TREBLE=false targets.

Bug: 217455793
Change-Id: I8c07baf9d308ea734ffed5d9b1776b60cdbf3435
2022-02-18 20:03:10 -08:00
David Anderson
1af04ccab7 Merge "Revise partition size for system_other.img" am: c25bd3c8a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1991771

Change-Id: Iefc7b52ecb6bc6a9ff717f189749df733a2793c9
2022-02-19 01:42:44 +00:00
Treehugger Robot
cea047c023 Merge "Fix ota_from_target_files error in non-AB VF" am: 68f7e84519
Original change: https://android-review.googlesource.com/c/platform/build/+/1986310

Change-Id: I45504e48e0fd4fec75d65b38f03c516596612672
2022-02-19 01:42:33 +00:00
David Anderson
c25bd3c8a0 Merge "Revise partition size for system_other.img" 2022-02-19 01:28:24 +00:00
Treehugger Robot
68f7e84519 Merge "Fix ota_from_target_files error in non-AB VF" 2022-02-19 01:19:24 +00:00
Melisa Carranza Zuniga
46930d7a85 Adding flags and logic to sign updateable SEPolicy in APEX
Verify with command:
sign_apex --container_key=testdata/testkey
--payload_key=testdata/testkey_RSA4096.key
--sepolicy_key=testdata/testkey_RSA4096.key
--sepolicy_cert=testdata/testkey.x509.pem
$OUT/system/apex/com.android.sepolicy.apex
$OUT/test/sepolicy.apex

Test: mma and run sign_apex
Change-Id: I8cc5bbc09058b57e463b1d40d4953d62e0438389
2022-02-19 00:01:09 +01:00
Daniel Norman
9f48b3cf4a Merge changes I1d1ec878,I25c1dc20 am: 27cbdd9809
Original change: https://android-review.googlesource.com/c/platform/build/+/1991151

Change-Id: Ia8142fbe3de78174978057b67f697b767780d1a2
2022-02-18 21:44:57 +00:00
Treehugger Robot
412eb36668 Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1879917

Change-Id: I1535cdb272f9c75b0364cb0dce65520f0c523f38
2022-02-18 21:44:34 +00:00
Po Hu
a6c5912e4d Fix ota_from_target_files error in non-AB VF
For vendor freeze, vendor.img/odm.img is rebuilt and moved to
the merged target files dir in a special build flow:
https://android-review.googlesource.com/c/platform/build/+/1752968

But considering non-AB case, some more files are generated by
MakeRecoveryPatch() along with vendor.img, such as:
IMAGES/vendor.map
VENDOR/etc/recovery.img
VENDOR/bin/install-recovery.sh

They should be copied to the merged target files dir as well,
in order to pass the check in HasRecoveryPatch() and
GetSparseImage().

Bug: 219871887
Test: Used to merge non-AB VF device
Change-Id: I003186b30e700413d54ee1b7521bd03ba83ad3f5
2022-02-18 13:25:51 -08:00
Daniel Norman
27cbdd9809 Merge changes I1d1ec878,I25c1dc20
* changes:
  Remove unnecessary AddCareMapForAbOta() in merge_target_files.
  Run pyformat on merge_target_files.py
2022-02-18 21:23:19 +00:00