StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,365 Commits 1 Branch 0 Tags
148ece6d76e1d2a2f3b455cd9ad88e2608cbdf1c
Commit Graph

76365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melisa Carranza Zuniga
46930d7a85 Adding flags and logic to sign updateable SEPolicy in APEX 
Verify with command:
sign_apex --container_key=testdata/testkey
--payload_key=testdata/testkey_RSA4096.key
--sepolicy_key=testdata/testkey_RSA4096.key
--sepolicy_cert=testdata/testkey.x509.pem
$OUT/system/apex/com.android.sepolicy.apex
$OUT/test/sepolicy.apex

Test: mma and run sign_apex
Change-Id: I8cc5bbc09058b57e463b1d40d4953d62e0438389
 2022-02-19 00:01:09 +01:00
Daniel Norman
c4e0737684 Merge changes I1d1ec878,I25c1dc20 am: 27cbdd9809 am: 9f48b3cf4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1991151

Change-Id: Ia3e2cd1b619bece3f7e7c18d4d49e5b92c79ecea
 2022-02-18 21:49:05 +00:00
Treehugger Robot
0f24066987 Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3 am: 412eb36668 
Original change: https://android-review.googlesource.com/c/platform/build/+/1879917

Change-Id: Id6f0f4a08c1f5be05b387c5803ef3d37c6313fb4
 2022-02-18 21:48:58 +00:00
Treehugger Robot
ef29f976e7 Merge "check_target_vintf: Properly glob Vintf file list" am: 3e77f44587 am: 05fc90f0fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1889615

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

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

Change-Id: I48f671890f6e8d336675e94ea682143eeeb0e222
 2022-02-18 21:48:34 +00: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
Treehugger Robot
ec4ce2fcb4 Merge "Sort AB_OTA_PARTITIONS" am: 94daa8bfab am: 35630ea74e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1990850

Change-Id: Icee3c88ef63f2ed370e05f9c99755b02b43bf0b7
 2022-02-18 21:46:28 +00:00
Daniel Norman
3cbb1bcfa8 Merge "Fix build break for vendor freeze" am: f14e8caca7 am: 42a30f0ed4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1836120

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

Change-Id: If63d25eb4894907c3f7503df4dd50b92bcbca420
 2022-02-18 21:46:08 +00:00
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
Android Build Coastguard Worker
e1c656c0bd Version bump to SP2A.220405.002 [core/build_id.mk] 
Change-Id: I945fa1f55a76ea11b42e07e64c4a7e758059789e
 2022-02-18 20:16:15 +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