Commit Graph

29368 Commits

Author SHA1 Message Date
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
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
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
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
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
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
1e1777605a Merge "Make it possible to avoid specifying boot partition sizes." am: b23cdfb12b
Original change: https://android-review.googlesource.com/c/platform/build/+/1989408

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

Change-Id: I13fbd15950d597861ab394412007c26cfe9c1ec3
2022-02-18 21:14:53 +00:00
Treehugger Robot
35630ea74e Merge "Sort AB_OTA_PARTITIONS" am: 94daa8bfab
Original change: https://android-review.googlesource.com/c/platform/build/+/1990850

Change-Id: Idb64b02f7c061b91a6f349e922a78516db53c111
2022-02-18 21:13:11 +00:00
Treehugger Robot
b23cdfb12b Merge "Make it possible to avoid specifying boot partition sizes." 2022-02-18 01:40:25 +00:00
Treehugger Robot
0eebb8580e Merge "Add data_bins to data_dependencies in module-info" 2022-02-18 01:26:07 +00:00
Treehugger Robot
94daa8bfab Merge "Sort AB_OTA_PARTITIONS" 2022-02-18 01:17:45 +00:00
Peter Collingbourne
730200ec86 Make it possible to avoid specifying boot partition sizes.
Virtual platforms may have no boot partition as such, so there
is no practical limit on the partition size. Therefore, make it
possible to omit the partition size (i.e. by omitting a definition of
BOARD_*BOOTIMAGE_PARTITION_SIZE), allowing unrestricted boot partition
sizes on those platforms.

The macro get-bootimage-partition-size needs to return an empty string
in the case where the variable is not defined in order for consumers
such as assert-max-image-size and get-hash-image-max-size that test
its result using $(if) to properly disable the size check in that
case. The indentation was causing the macro to return the string
"  " instead, which caused an unrequested size check to be inserted.
Fix it by removing the indentation.

A separate patch to avbtool makes it possible to omit the
--partition_size argument when passing --dynamic_partition_size.

Change-Id: Ie836feeb4c3e3b86d9c7950ff45933294cea9410
Bug: 142352330
2022-02-17 14:26:56 -08:00
Cole Faust
900999973e Sort AB_OTA_PARTITIONS
Some product config makefiles are being refactored for
the conversion to Starlark. In order to test that the
refactor doesn't cause any meaningful change, we test
that the ninja files are the same before/after the refactor.
Currently, they have differences in the order of AB_OTA_PARTIONS,
which shouldn't matter. In order to increase our confidence
and make the ninja files more stable, sort AB_OTA_PARTITIONS
before it's used.

Bug: 220169197
Test: Presubmits
Change-Id: I6a9f9f2990406d810577cf8930416925f2987311
2022-02-17 11:35:27 -08:00
Anton Hansson
fd9a21b9bd Pass the base sdk extension version to soong
So that it can be added to the soong config.

Bug: 220086085
Test: m nothing && inspect soong.variables
Change-Id: I949059b9284b16220e2489010279aeae98b4b7fb
2022-02-17 11:16:18 +00:00
yangbill
e6b498bf2d Add data_bins to data_dependencies in module-info
This change exports the list of test_data_bins as data dependencies
that are required by modules when running the test.

Bug: 215234071
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Ie5c1ef70055618a5fa0ba1bcfbcba8054743d41a
2022-02-17 05:17:03 +00:00
Treehugger Robot
5cea07bb12 Merge "Add sepolicy prebuilt API dirs to soong config" am: b194430f63
Original change: https://android-review.googlesource.com/c/platform/build/+/1985069

Change-Id: I25b98136d0625d91f422f4bf68b198c5c33b0a8d
2022-02-17 01:46:44 +00:00
Treehugger Robot
b194430f63 Merge "Add sepolicy prebuilt API dirs to soong config" 2022-02-17 01:26:04 +00:00
Treehugger Robot
3f11948e03 Merge "Update to llvm-ar's new argument format" am: 4d56eccb79
Original change: https://android-review.googlesource.com/c/platform/build/+/1988046

Change-Id: I6cabd97eff8ca7c7792b6b50059081fe3c6088b2
2022-02-16 22:56:21 +00:00
Yi Kong
b1ebaebd94 Update to llvm-ar's new argument format
llvm-ar bundled in the next llvm update will stop accepting the legacy
single-dash argument format.

Bug: 219872355
Test: presubmit
Change-Id: Iede68e4b13c3a01c176d26f335f96879c5c72c12
2022-02-16 18:41:09 +08:00
Xin Li
4455b0dc97 Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:31:18 +00:00
Inseob Kim
cc665e54e3 Add sepolicy prebuilt API dirs to soong config
Bug: 33691272
Test: build
Change-Id: Id2ea256507cdbcdcd67751c96c911f49f5fdb3f0
2022-02-14 23:10:08 +09:00
Artur Satayev
ac87c5e13a Merge "Introduce ro.build.version.known_codenames sysprop." 2022-02-14 12:08:04 +00:00
Treehugger Robot
6d361637e3 Merge "Add macros for declaring copied file licenses." 2022-02-12 01:59:49 +00:00
Bob Badour
8cbb845e37 Add macros for declaring copied file licenses.
The PRODUCT_COPY_FILES is populated before definitions.mk mapping
source files to installed files that get copied unchanged.

Need to be able to declare license metadata for the copied files such
that similarly named files in different projects can have different
licenses.

Need a macro to convert target names to their corresponding license
metadata.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing

Change-Id: Ic244b3525e72b6cd8c4c4305bf5ad430d6e24ccb
2022-02-11 14:10:06 -08:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Xin Li
b3a96bd273 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ibcb32225098883b4098807da6468a539e1c41c0c
Change-Id: I408a03e95c0240420c5e5492988abdc4937a0a62
2022-02-11 07:01:21 +00:00
Treehugger Robot
b52c28d026 Merge "Export runtime dependencies in module-info" 2022-02-11 00:56:26 +00:00
Treehugger Robot
3c84e5f114 Merge "Add an misc_info.txt entry to customize VABC compression" 2022-02-10 08:41:04 +00:00
yangbill
fa5026c4d8 Export runtime dependencies in module-info
This change exports the list of dependencies that are required by
modules at runtime. Note that only the host case is currently
handled.

Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I05199c54da311e59c7ea87595397ee4eecfab6a3
2022-02-10 08:07:13 +00:00
yangbill
10adf32047 Add missing LOCAL_ROTATION_MIN_SDK_VERSION
This definition missing will cause merge conflict which is already in
main branch.

Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Ifc103268aad9d6769822ff1eae4db1cc59aee57e
Merged-In: I3b5e9bb3985c2ae83381499a44b339a7b1deb05c
2022-02-10 08:05:06 +00:00
Kelvin Zhang
fa91e98985 Add an misc_info.txt entry to customize VABC compression
Products can define PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD
to specify the compression algorithm they prefer, or "none"
for no compression at all.

Test: th
Change-Id: I4fa27bd2c87b8f46c51023168d079e9b47ce2924
2022-02-09 14:23:16 -08:00
Treehugger Robot
a95befe008 Merge "Pass --makefile_list to rbc board configuration" 2022-02-08 20:06:45 +00:00