Commit graph

73641 commits

Author SHA1 Message Date
Daniel Norman
c44f964a5a Allow missing key for misc_info lookups.
This broke the TV-VF build in ab/8246202.

Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d
2022-03-03 19:42:32 +00:00
Treehugger Robot
0b6921be2b Merge "Add SPL downgrade option help text" 2022-03-03 17:56:41 +00:00
Treehugger Robot
5b48aeccb2 Merge "Clean up merge_target_files" 2022-03-02 23:51:31 +00:00
Cole Faust
339d56308d Merge "Add Starlark implementation of add-product-dex-preopt-module-config" 2022-03-02 18:40:36 +00:00
Paul Hu
70dc07dbd3 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" 2022-03-02 07:11:25 +00:00
Treehugger Robot
ff17a1bd66 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" 2022-03-02 05:08:27 +00:00
Treehugger Robot
92c59c42d3 Merge "Fix releasetools OWNERS for merge." 2022-03-02 01:32:34 +00:00
Mitch Phillips
d51048acdd Revert "[cc_fuzz] Revert 'disable LTO' patches."
Revert "[cc_fuzz] Revert 'disable LTO' patches."

Revert submission 1976512-revert-nolto-fuzzing

Reason for revert: b/222160662
Reverted Changes:
Iacee4fa29:[cc_fuzz] Revert 'disable LTO' patches.
Ic509b00a1:[cc_fuzz] Revert 'disable LTO' patches.
If85931f09:[cc_fuzz] Revert 'disable LTO' patches.

Change-Id: I5f34731f0b7b27293636217f43d1cf5f17ab487b
2022-03-02 01:25:22 +00:00
Akilesh Kailash
6eb483745b Merge "Enable Async merge during OTA" 2022-03-02 01:05:24 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Kelvin Zhang
e174c323e1 Add SPL downgrade option help text
Test: th
Change-Id: I71f916642f6327acad1d0c163a204718002f876d
2022-03-01 15:59:08 -08:00
Treehugger Robot
df80322fcd Merge "[cc_fuzz] Revert 'disable LTO' patches." 2022-03-01 23:43:04 +00:00
Daniel Norman
5177fcb28d Fix releasetools OWNERS for merge.
My extra _ meant that OWNERS was removed for merge_target_files.

Change-Id: I15f89b9edf31d126df19b66998520e8545cdfbd0
2022-03-01 17:58:34 +00:00
Liz Kammer
16e2fc2da1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" 2022-03-01 15:19:34 +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
171c1e168e Merge "Add to OWNERS for merge tooling." 2022-03-01 02:32:17 +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
Treehugger Robot
fb3cdf5fc8 Merge "Remove product debug files" 2022-03-01 01:57:55 +00:00
paulhu
83f6ef5379 Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
Change-Id: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
2022-03-01 01:26:31 +00:00
Daniel Norman
0374741b7b Clean up merge_target_files
Summary of changes:
- Rename extract_items args to be more generic.
- For many other functions, replace large argument lists with
  the OPTIONS shared object.
- Rename process_* functions to merge_* to be more clear about
  the purpose of the function.
- Remove verbose code in merge_ab_partitions_txt().
- Extract certain logic from merge_misc_info_txt() and place it
  into other existing functions: dynamic partition and selinux
  keys are now processed in their own functions.
- Remove verbose code in merge_package_keys_txt().
- Remove verbose code in create_file_contexts_copies().
- Handle extracting from META directly in merge_meta_files(),
  rather than doing this extraction in create_merged_package()
- Storing the set of framework and vendor partitions in OPTIONS
  so it can be reused by multiple functions without needing to
  be parsed again.

Bug: 221858722
Test: atest test_merge_target_files
Test: Use merge_target_files to merge some builds
Change-Id: I8aa429c8fbb05223127b116aab84b2678ac264a8
2022-02-28 16:48:27 -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
Daniel Norman
4cf1e03c1c Add to OWNERS for merge tooling.
Includes more folks to increase "bus factor" for these files,
as well as including the merge test.

Change-Id: I8a5e8d1600fd4e03f75338193609f496a964f790
2022-02-28 22:30:49 +00:00
Cole Faust
b8442f02e8 Add Starlark implementation of add-product-dex-preopt-module-config
Bug: 221877397
Test: Manually
Change-Id: Ia8dd4fcfddb218aba7174590dbc754057f3899af
2022-02-28 11:13:43 -08:00
Treehugger Robot
dce675548d Merge "Fix is-board-vendor-qcom: do not return a string consisting of whitespace." 2022-02-28 08:34:23 +00:00
Akilesh Kailash
6c171a69b2 Enable Async merge during OTA
If the async merge has a temporary failure, gracefully fallback
to synchronous I/O without failing the OTA merge.

Bug: 220991038
Test: 1: OTA on CF pre-submit runs
2: OTA on O6, R4 and Bramble with the following flow on TP builds:

BUILD-1 (without-this-patch) -> BUILD-2 (with this patch) -> BUILD-3 (with this patch)

Verified the failure path of async merge on all three devices

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I0b499d2cc81f44c74f85745f9165b81d0ce34eba
2022-02-28 06:29:50 +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
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
8fa04e25a3 Merge "Make product config handles into structs" 2022-02-25 23:10:31 +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
1420aa099a Merge "Remove ostensibly unused host tools notice." 2022-02-25 18:30:02 +00:00
Jooyung Han
4d0af554ce Merge "Replace pvmfw embedded public key" 2022-02-25 06:39:20 +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
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
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
e9d3c2e85a Merge "Add an ndk product and device" 2022-02-23 18:31:44 +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
15ecbb0810 Merge "Pass the base sdk extension version to soong" 2022-02-22 13:46:47 +00:00