Commit Graph

29493 Commits

Author SHA1 Message Date
Colin Cross
400a979b88 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I184be6d3aa140d09d5c7e83c8b242fca704ebc38
2022-03-02 00:34:34 +00:00
Treehugger Robot
2ff34809c7 Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd am: 7bf9d4e1fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I0c3453928e7da6aeba29bb4519e230d6dfb71c2b
2022-03-02 00:33:57 +00:00
Colin Cross
552c2d1c81 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I06dd0a5eef6a5dd16b1fd4b2d845d0de2ef088c9
2022-03-02 00:13:01 +00:00
Treehugger Robot
7bf9d4e1fa Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I94fbac5906c7864a750792333060068650e51404
2022-03-02 00:11:53 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Treehugger Robot
df80322fcd Merge "[cc_fuzz] Revert 'disable LTO' patches." 2022-03-01 23:43:04 +00:00
Liz Kammer
52f1ce8473 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1 am: 0ac682fc9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I62a726a4d418efb6dc82b95cb5f5accf3af0bebb
2022-03-01 16:13:27 +00:00
Liz Kammer
0ac682fc9a Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I789ab17d3f3b73e66502c90d9eb5cc32313514bd
2022-03-01 15:47:55 +00:00
Liz Kammer
16e2fc2da1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" 2022-03-01 15:19:34 +00:00
Yi-yo Chiang
4e8705b181 Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: Ie1685e3db923366676404465fe846d59f3559def
2022-03-01 05:36:25 +00:00
Yi-yo Chiang
e93bc67cf8 Merge changes from topic "gki-avb-vts" am: 9d164b6300
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I2792c3946e3b0173b3592612009eafd62e1090cc
2022-03-01 05:12:46 +00:00
Yi-yo Chiang
9d164b6300 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Update T GKI certification scheme
  Update T GKI certification scheme
2022-03-01 04:47:47 +00:00
Treehugger Robot
675fc37660 Merge "Remove product debug files" am: fb3cdf5fc8 am: 7a8db6594e
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I37b05a932ef801543ff1474a7d9ff86eb3123c4a
2022-03-01 02:47:28 +00:00
Treehugger Robot
7a8db6594e Merge "Remove product debug files" am: fb3cdf5fc8
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I38bdd064b2394e92fb70016820672f0ec23495f4
2022-03-01 02:25:50 +00:00
Colin Cross
a492544a03 Add PLATFORM_DISPLAY_VERSION
Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate
to the ro.build.version.release_or_preview_display property and
be shown as the Android version for preview releases by Settings.

Bug: 221950960
Test: manual
Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
2022-02-28 18:01:35 -08:00
Cole Faust
e23ae981cc Remove product debug files
These files are difficult to support in the Starlark product
configuration. They also aren't really a good representation
of products even with Makefiles, because they only display
information from products that have been imported with
import-nodes, but generate empty files for the other products
that are included from the imported ones.

For example, lunching aosp_arm64 then running
`m out/products/build/make/target/product/core_64_bit.mk.txt`
would generate a file full of empty variable assignments.

Bug: 221312856
Test: Presubmits
Change-Id: I18613a628968acc25b57b44e229de7df1b2476ef
2022-02-28 14:43:18 -08:00
Treehugger Robot
c0d5ef77ff Merge "Fix is-board-vendor-qcom: do not return a string consisting of whitespace." am: dce675548d am: a3960d0d1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2001770

Change-Id: I023fe1d91bb914c117a82e01dfa46dd4da281c16
2022-02-28 09:21:34 +00:00
Treehugger Robot
a3960d0d1b Merge "Fix is-board-vendor-qcom: do not return a string consisting of whitespace." am: dce675548d
Original change: https://android-review.googlesource.com/c/platform/build/+/2001770

Change-Id: I011e3f8d8b04670868821c8f6bbd3dcab534069c
2022-02-28 08:58:56 +00:00
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
Cole Faust
b18751018a Merge "Make product config handles into structs" am: 8fa04e25a3 am: beb515cfec
Original change: https://android-review.googlesource.com/c/platform/build/+/2000190

Change-Id: I9dc667683fc6f7664b4010bafd4c6772a494cf98
2022-02-25 23:51:41 +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
Treehugger Robot
71530d3fee Merge "Remove ostensibly unused host tools notice." am: 1420aa099a am: 67ce808a50
Original change: https://android-review.googlesource.com/c/platform/build/+/2000192

Change-Id: I8e3365c9d26dbe1313cae726a177f246b86ec120
2022-02-25 19:22:41 +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
ba28c6a1f5 Merge "Replace pvmfw embedded public key" am: 4d0af554ce am: 474339443f
Original change: https://android-review.googlesource.com/c/platform/build/+/1990892

Change-Id: Ica4ca4302134a3a5ca3936de63ec50ee2b5a5de4
2022-02-25 07:30:43 +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
ad19d29359 Merge "Add supported variants to module-info" am: b2d71c9b88 am: 9a983d7aa1
Original change: https://android-review.googlesource.com/c/platform/build/+/1991770

Change-Id: Ia3205c2f8f6579379d65b90965aa51afc3f9844f
2022-02-25 03:33:02 +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
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
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
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
e041e13a06 Merge "Change how we set ro.product.first_api_level." am: 0835ac67b6 am: bebf7dc7c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1992237

Change-Id: Ie9b28a4c762f53cfe9497bec9061b0e44d7dbd91
2022-02-23 21:45:04 +00: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
Treehugger Robot
cc08c91fa8 Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994b4 am: fb9c2f2205
Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: I50ffbdaa62c0630dc9b8af5b9b6212dc9111e13f
2022-02-23 17:04:49 +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
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
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
f0b990e54e Merge "Pass the base sdk extension version to soong" am: 15ecbb0810 am: 36089e0ea0
Original change: https://android-review.googlesource.com/c/platform/build/+/1989155

Change-Id: I929f8b89fb1d641edd0ca7fd50ddd0f76fa7bc73
2022-02-22 14:31:57 +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
Treehugger Robot
1c855870b5 Merge "Make it possible to avoid specifying boot partition sizes." am: b23cdfb12b am: 1e1777605a
Original change: https://android-review.googlesource.com/c/platform/build/+/1989408

Change-Id: I2eda3b198788062b80f2177ce9a51f1b7adedbc9
2022-02-18 21:48:26 +00:00
Treehugger Robot
bad6fcf447 Merge "Add data_bins to data_dependencies in module-info" am: 0eebb8580e am: f46cbe5abe
Original change: https://android-review.googlesource.com/c/platform/build/+/1981748

Change-Id: I15347642f6c1ea1cac31dc3e2f9233a2dd444268
2022-02-18 21:46:39 +00:00