StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,802 Commits 1 Branch 0 Tags
a2ae94e6896095c6b5590d8ed1e0e3d2fefea834
Commit Graph

29652 Commits

Author SHA1 Message Date
Treehugger Robot
60d85b4cee Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994b4 am: fb9c2f2205 am: cc08c91fa8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: Iac65ded6e2f65bc1c2a13af61b90a6cebdfa6c76
 2022-02-23 17:33:05 +00:00
Treehugger Robot
cc08c91fa8 Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994b4 am: fb9c2f2205 
Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: I50ffbdaa62c0630dc9b8af5b9b6212dc9111e13f
 2022-02-23 17:04:49 +00: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
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
9e95e0db92 Merge "Pass the base sdk extension version to soong" am: 15ecbb0810 am: 36089e0ea0 am: f0b990e54e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1989155

Change-Id: I26611f9e5b3edf5cf284d9a0eba5d72531b9aad3
 2022-02-22 15:04:19 +00:00
Anton Hansson
f0b990e54e Merge "Pass the base sdk extension version to soong" am: 15ecbb0810 am: 36089e0ea0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1989155

Change-Id: I929f8b89fb1d641edd0ca7fd50ddd0f76fa7bc73
 2022-02-22 14:31:57 +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
Bill Rassieur
2d0251cfbe Merge "DO NOT MERGE Designate tm-dev* branches as TM." into tm-dev 2022-02-21 17:01:23 +00:00
Treehugger Robot
b998ac9bfe Merge "Make it possible to avoid specifying boot partition sizes." am: b23cdfb12b am: 1e1777605a am: 1c855870b5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1989408

Change-Id: Ie31975f7fa77e9a7f4e45e62634a6ad2100cf7f9
 2022-02-18 22:09:38 +00:00
Treehugger Robot
55d9cd1572 Merge "Add data_bins to data_dependencies in module-info" am: 0eebb8580e am: f46cbe5abe am: bad6fcf447 
Original change: https://android-review.googlesource.com/c/platform/build/+/1981748

Change-Id: I536dad0e5c76bd4ddba46e5eff6eb48f350694a8
 2022-02-18 22:08:35 +00:00
Treehugger Robot
1a799adc5d Merge "Sort AB_OTA_PARTITIONS" am: 94daa8bfab am: 35630ea74e am: ec4ce2fcb4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1990850

Change-Id: Ibbb383a2842c4fbdc56d30be678fb849f013868f
 2022-02-18 22:08:27 +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
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
Bill Rassieur
24bbb12766 DO NOT MERGE Designate tm-dev* branches as TM. 
BUG:218719100

Change-Id: I3880438a8af16cfe559f4469e160f7a80281f163
 2022-02-18 08:08:31 -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
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
7ccb8cbde9 Merge "Add sepolicy prebuilt API dirs to soong config" am: b194430f63 am: 5cea07bb12 am: 3c1a32ba9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1985069

Change-Id: I207ed55be1cf7a0423726966ee0b5c639d7a55d1
 2022-02-17 02:29:56 +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
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
b95ed89e59 Merge "Update to llvm-ar's new argument format" am: 4d56eccb79 am: 3f11948e03 am: 4e8b1df7d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1988046

Change-Id: I5d579316441b8dac860fe9b7d6b07c5f2e6674a4
 2022-02-16 23:38:33 +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
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
e4814b895b Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938 am: f20c233bad 
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I2360bda8d8cc85e759f7870dea0ef09753551f5d
 2022-02-14 12:59:22 +00:00
Artur Satayev
f20c233bad Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938 
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: Ie7320298cd0c1fa511e2174e13fe4f34fe1e8ac5
 2022-02-14 12:43:40 +00:00
Artur Satayev
ac87c5e13a Merge "Introduce ro.build.version.known_codenames sysprop." 2022-02-14 12:08:04 +00:00
Treehugger Robot
6889493286 Merge "Add macros for declaring copied file licenses." am: 6d361637e3 am: 3d0b257b0a am: 0171332b5a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I9bb7e22cef08f7211b7051c3bc793dcc169c46c9
 2022-02-12 02:48:02 +00:00
Treehugger Robot
0171332b5a Merge "Add macros for declaring copied file licenses." am: 6d361637e3 am: 3d0b257b0a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I527b9f9d5cad79132802e580f58ea11e28155291
 2022-02-12 02:30:37 +00:00
Bassem Khalife
bc8d3620db Update Security String to 2022-04-05 am: 41a3269dd6 am: 6c815b28f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: I173a0b5da680b11694c0b6148be02867919c0e15
 2022-02-12 02:06:38 +00:00
Treehugger Robot
6d361637e3 Merge "Add macros for declaring copied file licenses." 2022-02-12 01:59:49 +00:00
Bassem Khalife
6c815b28f9 Update Security String to 2022-04-05 am: 41a3269dd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16742828

Change-Id: Ia3b5d968b608239a114ebb9ea844386c7f0eb98d
 2022-02-12 01:55:19 +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
ff2384d551 Merge "Export runtime dependencies in module-info" am: b52c28d026 am: 8829ee1440 am: 5fb866e401 am: a482a6030d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: Id5b5e9350ed76d3ce5d9a4bc6fa773244913a816
 2022-02-11 02:07:40 +00:00
Treehugger Robot
a482a6030d Merge "Export runtime dependencies in module-info" am: b52c28d026 am: 8829ee1440 am: 5fb866e401 
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: I9ceb8bc86c07697218592a80e2042af39f2353c8
 2022-02-11 01:47:25 +00:00