StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,475 Commits 1 Branch 0 Tags
50639bd4cb2f7923a1f7b200e8bb110353273eaf
Commit Graph

60475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
50639bd4cb Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e am: 6f978c6b7f 
Change-Id: Icaf368a8bb753eff980bc053395ad09033dfd47d
 2020-05-14 07:52:31 +00:00
Treehugger Robot
6f978c6b7f Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e 
Change-Id: I2f9b6dba41127c665dead70b0ff83760796616f8
 2020-05-14 07:22:16 +00:00
Treehugger Robot
ade028ea9e Merge "support different boot partition sizes in aosp_arm64" 2020-05-14 07:05:31 +00:00
Tianjie Xu
c7ff3baddf Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba am: f6dd644e6b 
Change-Id: I5620b9b975de46c5d99c30b0166a8d4a846e83d6
 2020-05-14 03:07:54 +00:00
Tianjie Xu
f6dd644e6b Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba 
Change-Id: I348a3c8093e85780bd641d460040b19a6878afda
 2020-05-14 02:54:12 +00:00
Tianjie Xu
7a3cf2c4ba Merge "Exclude vendor_boot in secondary payload" 2020-05-14 02:34:44 +00:00
Tianjie
c385064d94 Exclude vendor_boot in secondary payload 
The secondary payload is used by factory OTA to speed up the first
boot of the device. The payload should only contain bootloaders
images and the precompiled apps in system_other. Remove vendor_boot
to reduce the secondary payload size.

Test: build a package with secondary payload
Change-Id: I3a9f6dda00a5aac038438065e2bc6483d71b5e95
 2020-05-13 14:47:31 -07:00
Steve Muckle
a9241f6d51 Merge "Enables signing for generic boot images" am: 70ef6fd4f2 am: 0d121f4d2e 
Change-Id: I8bcd054148f76c4d065cd8526327d91f04411689
 2020-05-13 20:11:49 +00:00
Steve Muckle
0d121f4d2e Merge "Enables signing for generic boot images" am: 70ef6fd4f2 
Change-Id: I21567a60387a133d38c482d8c6e42b93ed66b2ee
 2020-05-13 19:47:21 +00:00
Steve Muckle
70ef6fd4f2 Merge "Enables signing for generic boot images" 2020-05-13 19:36:56 +00:00
TreeHugger Robot
1f3678e84c Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 
Change-Id: I18ae2cc04e6edad5498fdc0c2de6f5a163d10c82
 2020-05-13 18:25:35 +00:00
Yifan Hong
010d320848 resolve merge conflicts of 7169f754cc to rvc-dev-plus-aosp 
Change-Id: Ic1a44cfe929707e2fb76282dcd06f839a8159735
 2020-05-13 17:44:04 +00:00
TreeHugger Robot
4d8e9cc847 Merge changes from topic "nonab_on_vab_r" into rvc-dev 
* changes:
  Use add_slot_suffix function in edify script
  Support forcefully generating non-AB packages.
 2020-05-13 17:26:44 +00:00
Steve Muckle
11c4bcf406 support different boot partition sizes in aosp_arm64 
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

Bug: 156036850
Bug: 155049180
Change-Id: I73b70a4d52c2662c3015899632bb8a2b424108d5
 2020-05-12 16:51:45 -07:00
Tianjie Xu
6c9400948c Merge "Reland "Calculate the runtime fingerprint prefixes from build prop"" am: e9ab85956f am: 728d35e3a9 
Change-Id: Ifdd0fd225c0e0d7cdcb10442dacafcf986a197f7
 2020-05-12 19:19:51 +00:00
Tianjie Xu
728d35e3a9 Merge "Reland "Calculate the runtime fingerprint prefixes from build prop"" am: e9ab85956f 
Change-Id: Id16060ff55a5d550537f320befecf0eab25ac035
 2020-05-12 19:04:26 +00:00
Tianjie Xu
e9ab85956f Merge "Reland "Calculate the runtime fingerprint prefixes from build prop"" 2020-05-12 18:51:25 +00:00
Tianjie Xu
dca53f1a18 Merge "Reland "Add a wrapper class PartitionBuildProp""" am: 49b45296f6 am: 2399593a28 
Change-Id: I6f5d7244907bec60b1a4641327874ff95bdb551f
 2020-05-11 22:09:22 +00:00
Tianjie Xu
2399593a28 Merge "Reland "Add a wrapper class PartitionBuildProp""" am: 49b45296f6 
Change-Id: I991010fec552d2d268bd0b94aed09389b0870b6a
 2020-05-11 21:56:48 +00:00
Tianjie Xu
49b45296f6 Merge "Reland "Add a wrapper class PartitionBuildProp""" 2020-05-11 21:30:09 +00:00
Treehugger Robot
86ffd221cf Merge "Update Keymaster AIDL to V2 in VNDK list" am: f4a9f159aa am: 5f4eee2e30 
Change-Id: I82ea85bcc1fd5a546f52be3bf9be08999d75c061
 2020-05-11 19:45:12 +00:00
Treehugger Robot
5f4eee2e30 Merge "Update Keymaster AIDL to V2 in VNDK list" am: f4a9f159aa 
Change-Id: I940aa4b83d8b10cbe92fbd6c3fd896e251565ba2
 2020-05-11 19:30:43 +00:00
Treehugger Robot
f4a9f159aa Merge "Update Keymaster AIDL to V2 in VNDK list" 2020-05-11 17:28:43 +00:00
Inseob Kim
86e3ec7015 [automerger skipped] Merge "DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b2daf711a3 am: cb2303c806 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibffa5fb40c836c96449b13b082c583ee180bb568
 2020-05-11 10:27:40 +00:00
Inseob Kim
aaffdc8987 [automerger skipped] DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS am: f369fefbce am: 761ec57f1d -s ours 
am skip reason: subject contains skip directive

Change-Id: I43c0f66258d6f9bfbb93dec22681f8cc495ba0b0
 2020-05-11 10:27:37 +00:00
Inseob Kim
cb2303c806 Merge "DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b2daf711a3 
Change-Id: I6ae0158a4d5f5941fb7bffd428df03cb46b0b78c
 2020-05-11 10:11:37 +00:00
Inseob Kim
761ec57f1d DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS am: f369fefbce 
Change-Id: I2bdaffe4f8f13730e650b8c9901cc51cdf39aa54
 2020-05-11 10:11:34 +00:00
Inseob Kim
b2daf711a3 Merge "DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2020-05-11 09:53:21 +00:00
Yo Chiang
9aa6f2ac0d Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" am: 6190f6910f am: 62353ad6cc 
Change-Id: Iaab5fa62f64a83ceca7563aec38c6c4042d36702
 2020-05-11 05:42:24 +00:00
Yo Chiang
62353ad6cc Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" am: 6190f6910f 
Change-Id: Id77f56a8cf386192aac415f112d31497915ee852
 2020-05-11 05:26:06 +00:00
Yo Chiang
6190f6910f Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" 2020-05-11 05:14:29 +00:00
Tianjie Xu
9afb221c9e Reland "Calculate the runtime fingerprint prefixes from build prop" 
This reverts commit b21e48b499.

In practice, some partners use the 'import' statement to override
the device fingerprint at runtime. The runtime fingerprint will
later add to the metadata of OTA package, so that the OTA server
can deliver the package to corresponding devices correctly.

This CL supports parsing a subset of import statement that the init
process recognizes. And we loose the restriction based on how the
dynamic fingerprint is used in practice. Right now, we only searches
for the override of brand, name and device. And the placeholder
format should be ${placeholder}, with its value supplied by the
script caller.

As part of the implementation, we generate all the possible
combinations of the input boot variables. And recalculate the
fingerprint for each of the combination. Though we load the
build.prop multiple times, the logic is easier to follow. Also,
it's more convenient to enhance the logic if we only want to
allow some of the boot variables combination later.

Bug: 152167826
Change-Id: I4a9fa35c7ac037ff1cf4f9a4bdff602beac3894b
Test: unittests pass
 2020-05-10 21:49:53 +00:00
Tianjie Xu
0fde41e711 Reland "Add a wrapper class PartitionBuildProp"" 
This reverts commit 6022545272.

The build prop for a partition used to be a simple key:value
dictionary. But we need more fields to hold the alternative build
props overriden by the 'import' statement. Therefore, add a new
class as a wrapper for these props first.

Bug: 152167826
Change-Id: I5c952cd2a976ba1a09ddc66d56c2b8b55a61986b
Test: unittests pass
 2020-05-09 05:24:18 +00:00
Greg Kaiser
3fd11f86a6 Merge changes from topic "revert-1297095-MANSYJSCZY" am: 763c8a7691 am: 7eb76f74d9 
Change-Id: If2a0528ccea808512dca010d68929ad841607070
 2020-05-09 00:58:29 +00:00
Greg Kaiser
7eb76f74d9 Merge changes from topic "revert-1297095-MANSYJSCZY" am: 763c8a7691 
Change-Id: I08fd73accc7e881540aea1fdd96a188a9f20ae45
 2020-05-09 00:46:08 +00:00
Greg Kaiser
763c8a7691 Merge changes from topic "revert-1297095-MANSYJSCZY" 
* changes:
  Revert "Add a wrapper class PartitionBuildProp"
  Revert "Calculate the runtime fingerprint prefixes from build prop"
 2020-05-09 00:34:55 +00:00
Greg Kaiser
6022545272 Revert "Add a wrapper class PartitionBuildProp" 
Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: Ie846d23b9f5c3325d021236725826512be7a3c78
 2020-05-09 00:30:33 +00:00
Greg Kaiser
b21e48b499 Revert "Calculate the runtime fingerprint prefixes from build prop" 
Revert submission 1297095

Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...

Change-Id: I8b1262c6e94a1db349de39896e56f366c8d64d4c
 2020-05-09 00:30:33 +00:00
Tianjie Xu
e9dc695f60 Merge changes Iac093a40,I2fe7e93a am: 8aba9ec7c8 am: 93eec51aa4 
Change-Id: I3f20e7d90ccf0d83aab03f6d89e3b2522b596ffc
 2020-05-08 21:26:19 +00:00
Tianjie Xu
93eec51aa4 Merge changes Iac093a40,I2fe7e93a am: 8aba9ec7c8 
Change-Id: I7d79d696d261945c7287336e080064d24fc2e5da
 2020-05-08 21:09:41 +00:00
Tianjie Xu
8aba9ec7c8 Merge changes Iac093a40,I2fe7e93a 
* changes:
  Calculate the runtime fingerprint prefixes from build prop
  Add a wrapper class PartitionBuildProp
 2020-05-08 20:59:27 +00:00
Dan Shi
f60056f219 Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210 am: 7815818869 
Change-Id: I60db7fb585bd76866a10fd4b6eb1b0e8d89f99f1
 2020-05-08 20:38:01 +00:00
Dan Shi
7815818869 Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210 
Change-Id: Icd1823ee487ef7b3209f50d556ba7f2a4795d63b
 2020-05-08 20:16:36 +00:00
Dan Shi
fb42b79210 Merge "Revert "Add vts related artifacts to vts-core package"" 2020-05-08 20:03:06 +00:00
Dan Shi
c4fa187094 Revert "Add vts related artifacts to vts-core package" 
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build
Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
 2020-05-08 10:52:31 -07:00
David Zeuthen
d5505f2c74 Update Keymaster AIDL to V2 in VNDK list 
Bug: 156076333
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: I293f4cca815b62bbbaf6334b36a83c669694fd12
 2020-05-08 12:50:44 -04:00
Treehugger Robot
1f32f67ce2 [automerger skipped] Merge "Build com.android.inprocess.tethering for Go variant" am: 47f2597490 am: 27e8fbcac3 -s ours 
am skip reason: Change-Id I1c5ac07e72068a617fa20797496dd022f279d88e with SHA-1 d70896c24a is in history

Change-Id: I5886e79dec8035c564e735bf7e4612a0aa6756a0
 2020-05-08 12:47:29 +00:00
Treehugger Robot
27e8fbcac3 Merge "Build com.android.inprocess.tethering for Go variant" am: 47f2597490 
Change-Id: I3ffc3c2f95e816947c7e35e11f035dab0ff0d59a
 2020-05-08 12:29:38 +00:00
Treehugger Robot
47f2597490 Merge "Build com.android.inprocess.tethering for Go variant" 2020-05-08 12:11:47 +00:00
markchien
ddb0f0ab3b Build com.android.inprocess.tethering for Go variant 
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
Merged-In: I1c5ac07e72068a617fa20797496dd022f279d88e
 2020-05-08 09:33:42 +00:00