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
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
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
Includes more folks to increase "bus factor" for these files,
as well as including the merge test.
Change-Id: I8a5e8d1600fd4e03f75338193609f496a964f790
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.
Bug: 220019988
Test: m checkbuild
(cherry picked from commit 7475d557e4)
Merged-In: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
Change-Id: Id5ddcdc91060ea3c8c6c8537f54af4cb7e17637c
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.
Bug: 220019988
Test: m checkbuild
Change-Id: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
(cherry picked from commit 7475d557e4)
Merged-In:Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
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
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
