Commit Graph

75798 Commits

Author SHA1 Message Date
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
Treehugger Robot
07491322c3 Merge "ota_utils: Don't fail if metadata proto doesn't exist" 2022-02-18 21:20:07 +00:00
Treehugger Robot
05fc90f0fd Merge "check_target_vintf: Properly glob Vintf file list" am: 3e77f44587
Original change: https://android-review.googlesource.com/c/platform/build/+/1889615

Change-Id: I106ea4a1d45ff657be72702c82b8eb3823263ccd
2022-02-18 21:16:48 +00:00
Treehugger Robot
a840a264a0 Merge "Emit warning when build.prop import can't be resolved" am: 52f1acbd93
Original change: https://android-review.googlesource.com/c/platform/build/+/1990572

Change-Id: I4e3b46f26867650bc69daa085101f2ed97ddadca
2022-02-18 21:16:39 +00:00
Treehugger Robot
9974ee58e2 Merge "Improve error message for GetMinSdkVersion" am: a88313f60b
Original change: https://android-review.googlesource.com/c/platform/build/+/1983906

Change-Id: Iced27595e1e371331c9c4df2dd09d295904c62c1
2022-02-18 21:16:30 +00: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
Daniel Norman
42a30f0ed4 Merge "Fix build break for vendor freeze" am: f14e8caca7
Original change: https://android-review.googlesource.com/c/platform/build/+/1836120

Change-Id: I98ae1c7e2bc9c721c6acb83054a8910ea23c68ff
2022-02-18 21:13:02 +00:00
Peter Collingbourne
2012fd1d00 Merge "Reland "Add a core configuration that disables the zygote."" am: 8e5920a665
Original change: https://android-review.googlesource.com/c/platform/build/+/1987266

Change-Id: I9702c77f909848ff302febf0540958ae35c680c6
2022-02-18 21:12:47 +00:00
Luca Stefani
b6075c581b ota_utils: Don't fail if metadata proto doesn't exist
The protobuf addition is present only in S+
while the legacy metadata is always present

Test: tools/gen_update_config.py with ota from R
Change-Id: I482c75b6b3b2b1ade139e59dc9dc57dbf9731d45
2022-02-18 11:37:43 +00:00
Treehugger Robot
3e77f44587 Merge "check_target_vintf: Properly glob Vintf file list" 2022-02-18 09:22:16 +00:00
Po Hu
1c48b59aa1 Revise partition size for system_other.img
system_other may be dynamic partition.
Do not fix its partition size as system's.

Bug: 220258352
Change-Id: Iacd14769ec14f43e3871d3c50a6627e6471284b1
2022-02-18 09:11:40 +00:00
Treehugger Robot
52f1acbd93 Merge "Emit warning when build.prop import can't be resolved" 2022-02-18 05:58:27 +00:00
Treehugger Robot
a88313f60b Merge "Improve error message for GetMinSdkVersion" 2022-02-18 05:58:23 +00:00
Kelvin Zhang
07c71ac1b9 Remove catch + sys.exit idiom
This is bad, python already prints exceptino message and exit with
non-zero code when an exception is raised, no need to catch the
exception just to print it. In addition, printing an exception does not
print stacktrace, so catch + sys.exit provide less information than
python's default behavior.

Test: th
Change-Id: If6cf2e34d4ebc9f7d172063b4396bf4377dad447
2022-02-17 21:46:21 -08: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
Daniel Norman
a84d13bc6e Remove unnecessary AddCareMapForAbOta() in merge_target_files.
This function is already called by add_img_to_target_files, when needed.

Bug: 187432243
Test: Create a merged build with ab partitions and OTA package
Change-Id: I1d1ec878f4dcf16c8fcbbea10e787a78d1478328
2022-02-17 14:16:40 -08:00
Daniel Norman
e292f5f105 Run pyformat on merge_target_files.py
Test: n/a
Change-Id: I25c1dc20c367e6b733e9fa4ea77d1873f5ba9a9b
2022-02-17 14:16:10 -08:00
Daniel Norman
f14e8caca7 Merge "Fix build break for vendor freeze" 2022-02-17 22:01:22 +00:00
Kelvin Zhang
42ab828754 Emit warning when build.prop import can't be resolved
Some mountpoints are only available at device runtime, so ignore import
failures in release tools.

Bug: 214322896
Test: th
Change-Id: I1e8c4fb08c6b825fa19c0f0e019dfaf2b03f2927
2022-02-17 13:07:55 -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
Peter Collingbourne
8e5920a665 Merge "Reland "Add a core configuration that disables the zygote."" 2022-02-17 18:37:21 +00: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
3c1a32ba9d Merge "Add sepolicy prebuilt API dirs to soong config" am: b194430f63 am: 5cea07bb12
Original change: https://android-review.googlesource.com/c/platform/build/+/1985069

Change-Id: Ia5b4634f06a0f06a0fe57c9afa8ef734aa42155c
2022-02-17 02:08:30 +00:00
Treehugger Robot
7de681eaf0 Merge "Fix warning when running fsverity tools" am: a2373a7a7a am: 8763778e8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1987346

Change-Id: Ie1f1545d9ee0d2deaefbe08f86c8c7a64c1b826a
2022-02-17 02:08:08 +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
8763778e8a Merge "Fix warning when running fsverity tools" am: a2373a7a7a
Original change: https://android-review.googlesource.com/c/platform/build/+/1987346

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

Change-Id: I634500e3efe3b49b57567413f3106d5759f5ed5d
2022-02-16 23:18:41 +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
Treehugger Robot
4d56eccb79 Merge "Update to llvm-ar's new argument format" 2022-02-16 22:26:14 +00:00
Treehugger Robot
0b0778e941 Merge "Revert "Enable io_uring feature for virtual A/B OTA"" am: 28e4826995 am: 283db80c18
Original change: https://android-review.googlesource.com/c/platform/build/+/1987208

Change-Id: I77333b9fc0e39e088f9719ff289e9799e65ac2f7
2022-02-16 13:19:47 +00:00
Treehugger Robot
283db80c18 Merge "Revert "Enable io_uring feature for virtual A/B OTA"" am: 28e4826995
Original change: https://android-review.googlesource.com/c/platform/build/+/1987208

Change-Id: Iff21d565b191489221534fe4f094d113e3cd2abe
2022-02-16 12:57:45 +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
Treehugger Robot
28e4826995 Merge "Revert "Enable io_uring feature for virtual A/B OTA"" 2022-02-16 08:50:36 +00:00
Akilesh Kailash
f1e7fb3af7 Revert "Enable io_uring feature for virtual A/B OTA"
This reverts commit f72860ce18.

Reason for revert: http://b/219642530 - I/O failures seen on one specific device intermittently. Let's pause this; I will revisit it before we land it back as we don't want to hold dogfood builds.

Change-Id: I3a80ccf5f67daed01d5b2e6a502e8acea85a769f
2022-02-16 04:21:01 +00:00
Inseob Kim
293112d59a Fix warning when running fsverity tools
Bug: 219777071
Test: m fsverity_manifest_generator; fsverity_manifest_generator
Change-Id: Ib5dd55b24a81438b9d536bf29c7ff2b4a91faf3f
2022-02-16 11:22:03 +09:00
Peter Collingbourne
69c29e1bc3 Reland "Add a core configuration that disables the zygote."
In targets that do not include a zygote binary, attempting to start the
zygote service will result in repeated service restarts. Avoid this by
providing a way for targets to opt out of declaring a zygote service.

The fvp_mini target does not have a zygote, so apply this opt-out to
that target.

Relanding after fixing breakage on an internal branch.

Bug: 217455793
Change-Id: Ic26f76142afb5f700bd7b12359d62feb2652b617
2022-02-15 16:03:35 -08:00
Bassem Khalife
efb002828e [automerger skipped] Update Security String to 2022-04-01 am: 8eac089eef am: c1c129c70e am: 0cc522cbae am: 19dac5cf1e am: 668264a040 am: 477e695aac -s ours am: bbd6e999f4 -s ours
am skip reason: Merged-In Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 with SHA-1 41a3269dd6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742829

Change-Id: I9bb6d4cfe35e7d1c83da93f6a78147022f48ba52
2022-02-15 19:41:33 +00:00
Bassem Khalife
bbd6e999f4 [automerger skipped] Update Security String to 2022-04-01 am: 8eac089eef am: c1c129c70e am: 0cc522cbae am: 19dac5cf1e am: 668264a040 am: 477e695aac -s ours
am skip reason: Merged-In Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 with SHA-1 41a3269dd6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742829

Change-Id: Icd507231588dbc0ef33b7c0fa39b3307e21ec45a
2022-02-15 19:24:35 +00:00
Bassem Khalife
477e695aac Update Security String to 2022-04-01 am: 8eac089eef am: c1c129c70e am: 0cc522cbae am: 19dac5cf1e am: 668264a040
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742829

Change-Id: I9be8b0cc2f958ea506e032e37ef692e155842765
2022-02-15 19:06:28 +00:00