StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,134 Commits 1 Branch 0 Tags
aac3183d422a90d0573e953ffa6027eafc3181ef
Commit Graph

62134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
aac3183d42 Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862 am: 8e8444d4fe am: f609e203c4 am: 345cd28fbb 
Change-Id: I5b7f077f17973ba021a3ad894b4fa4c34522808e
 2020-05-15 03:51:03 +00:00
Treehugger Robot
345cd28fbb Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862 am: 8e8444d4fe am: f609e203c4 
Change-Id: I6cb0d54c761869154c26aacd87cde15414164893
 2020-05-15 03:22:52 +00:00
Treehugger Robot
f609e203c4 Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862 am: 8e8444d4fe 
Change-Id: Ie34947a59de27798f01663ed31e9fd9ebde3db77
 2020-05-15 03:11:13 +00:00
Treehugger Robot
8e8444d4fe Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862 
Change-Id: If12633a2be57ffbb42d0306193a226164e77e2d4
 2020-05-15 02:51:58 +00:00
Treehugger Robot
09dd92a862 Merge changes from topic "remove_default_prop" am: 4e0bce688c 
Change-Id: I6b1eb0ded64eda84b15f4c2a9e08d067f61142a4
 2020-05-15 02:35:00 +00:00
Treehugger Robot
4e0bce688c Merge changes from topic "remove_default_prop" 
* changes:
  Remove /system/etc/prop.default
  Remove /vendor/default.prop
 2020-05-15 02:12:49 +00:00
Treehugger Robot
124a48f8f1 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 am: 16402667c4 am: b05afb3207 am: 17890662de am: e1ff3195f9 
Change-Id: I61fe1d98cadb5f75e0c05cb5cbe63ad3ef8120ea
 2020-05-15 01:58:17 +00:00
Treehugger Robot
e1ff3195f9 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 am: 16402667c4 am: b05afb3207 am: 17890662de 
Change-Id: Ib5c4221dada77d1071f9693b11183427237d8dbf
 2020-05-15 01:45:51 +00:00
Treehugger Robot
17890662de Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 am: 16402667c4 am: b05afb3207 
Change-Id: Iad2805d665147851bba25ed0697244998127a882
 2020-05-15 01:31:02 +00:00
Treehugger Robot
b05afb3207 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 am: 16402667c4 
Change-Id: I9ad800b0f5aad55eac82c802cbb6b1b5a1926245
 2020-05-15 01:18:06 +00:00
Treehugger Robot
16402667c4 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 
Change-Id: I0c832af83237e72163be868551a5bcfbaf81e276
 2020-05-15 00:59:04 +00:00
Treehugger Robot
f774ae9aa0 Merge "Fix _ImportParser() error if property is imported from oem partition." 2020-05-15 00:39:52 +00:00
Hongguang Chen
b4702b7006 Fix _ImportParser() error if property is imported from oem partition. 
The oem partition allows system build.prop to import properties from it
by "import /oem/oem.prop xxxx". An _ImportParser() error was raised on
this case.

BUG: 154171021
Test: 1) "atest --host releasetools_test releasetools_py3_test -c"
      2) On a device who has oem partition, "make dist" and sign its
      target zip file.
Change-Id: I47875bf7a698390e11690150e6516a3064550ca0
 2020-05-14 17:44:14 +00:00
Paul Duffin
357573f479 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef am: 61b3971e66 am: 00f6a090c2 am: 3c1f841e13 am: 8f94cdb635 
Change-Id: I3a2962448572903f3ad718d652c6f67b8a5727ad
 2020-05-14 10:46:08 +00:00
Paul Duffin
8f94cdb635 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef am: 61b3971e66 am: 00f6a090c2 am: 3c1f841e13 
Change-Id: I12e43c8e659bba7f77a9cfe5b223bd99d5f551fe
 2020-05-14 10:32:30 +00:00
Paul Duffin
3c1f841e13 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef am: 61b3971e66 am: 00f6a090c2 
Change-Id: I9a18221bbfc0f3f0687ba61e8c82988090d62459
 2020-05-14 10:16:46 +00:00
Paul Duffin
00f6a090c2 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef am: 61b3971e66 
Change-Id: I9bfa60c9d39199735676b776cde921d9628c7209
 2020-05-14 09:57:56 +00:00
Paul Duffin
61b3971e66 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef 
Change-Id: I8cf4b0a6856abf1233d221d36bcd1cb4a1c1ec10
 2020-05-14 09:44:39 +00:00
Paul Duffin
29beb858ef Merge "Revert "support different boot partition sizes in aosp_arm64"" 2020-05-14 09:23:49 +00:00
Treehugger Robot
6ebbe9dc50 Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e am: 6f978c6b7f am: 50639bd4cb am: 41edc0fffe am: 94f8163906 
Change-Id: Ic1a2a3866a90283a8dc1707a243ac7f3d80d47fe
 2020-05-14 08:42:46 +00:00
Paul Duffin
b5a334d0b3 Revert "support different boot partition sizes in aosp_arm64" 
This reverts commit 11c4bcf406.

Reason for revert: Broke build b/156569314

Bug: 156569314
Change-Id: I384740320acf48d09b0544e45b5a13ff0a6a163d
 2020-05-14 08:40:52 +00:00
Treehugger Robot
94f8163906 Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e am: 6f978c6b7f am: 50639bd4cb am: 41edc0fffe 
Change-Id: Ica22269fc8cdb19707a022af7d03dfea0986474b
 2020-05-14 08:23:42 +00:00
Treehugger Robot
41edc0fffe Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e am: 6f978c6b7f am: 50639bd4cb 
Change-Id: I633ad641d9cae7588856a0cb594bc3752ee2d4cb
 2020-05-14 08:11:20 +00:00
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
Jiyong Park
09153e244e Remove /system/etc/prop.default 
Contents that were in /system/etc/prop.default are now in
/system/build.prop.

The content is placed at the top of build.prop to keep the existing
order between the two files.

Caveat: /prop.default still remains for non-Treble devices.

Bug: 117892318
Test: TH passes
Test: inspect  /system/build.prop and check if it has contents from
the old /system/etc/prop.default file

Change-Id: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
 2020-05-14 16:28:19 +09: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
Jiyong Park
b894d4bb68 Remove /vendor/default.prop 
Contents that were in /vendor/default.prop are now in /vendor/build.prop

The content is placed at the top of build.prop to keep the existing
order between default.prop and builld.prop.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file

Change-Id: Ifa1f1dca3b4f4a5fa87d26b8ee058ee706dc54bb
 2020-05-14 16:19:32 +09:00
Treehugger Robot
ade028ea9e Merge "support different boot partition sizes in aosp_arm64" 2020-05-14 07:05:31 +00:00
Tianjie Xu
cc881e2c50 Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba am: f6dd644e6b am: c7ff3baddf am: 9852987c0d am: 949b3d57be 
Change-Id: Ie92f4bd2ebc59bbe3cdee0267c4b11157db4e583
 2020-05-14 03:42:56 +00:00
Tianjie Xu
949b3d57be Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba am: f6dd644e6b am: c7ff3baddf am: 9852987c0d 
Change-Id: Ic35099a487f85bf4a3f9e25bdc1e38e094104c3a
 2020-05-14 03:32:28 +00:00
Tianjie Xu
9852987c0d Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba am: f6dd644e6b am: c7ff3baddf 
Change-Id: I1ae71d841a5fa21fa592530a35f6545258569cf5
 2020-05-14 03:20:08 +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
7cdba11be0 Merge "Enables signing for generic boot images" am: 70ef6fd4f2 am: 0d121f4d2e am: a9241f6d51 am: 4a6687bdc8 am: 6349a8e3e6 
Change-Id: Id5c4ef2f9e594001322707d2b44a3a4a827900f0
 2020-05-13 21:03:57 +00:00
Steve Muckle
6349a8e3e6 Merge "Enables signing for generic boot images" am: 70ef6fd4f2 am: 0d121f4d2e am: a9241f6d51 am: 4a6687bdc8 
Change-Id: Ie168b6c1be3653318535ab9242f5dd58f2f0ba34
 2020-05-13 20:45:13 +00:00
Steve Muckle
4a6687bdc8 Merge "Enables signing for generic boot images" am: 70ef6fd4f2 am: 0d121f4d2e am: a9241f6d51 
Change-Id: I8b07c9f05cc921d1d2a087e8d599ffeca560501f
 2020-05-13 20:32:08 +00: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
f3eba89b26 Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 am: 40a4a04a61 am: 328ee80a64 am: 3b34c3b913 
Change-Id: Ifd3e25f892858522e552a41479a1bc6d3dc23a4f
 2020-05-13 19:19:13 +00:00
Yifan Hong
7ddd0d29e0 Support forcefully generating non-AB packages. am: 7169f754cc am: 8e6f49d69b am: 4886370d08 am: bcf3af8b42 
Change-Id: I4249ef589d193586589ab1021687b47eb726e926
 2020-05-13 19:19:11 +00:00
TreeHugger Robot
6ce50984ad Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 am: 40a4a04a61 am: 05f0a7bfd3 am: 2e9a29f0db 
Change-Id: Ibe4d91d8e32543fb8894359eff0cef25265bc0a7
 2020-05-13 19:19:01 +00:00
Yifan Hong
dfd3c140f8 Support forcefully generating non-AB packages. am: 7169f754cc am: 8e6f49d69b am: 7fa6d0c311 am: 5e2c94725e 
Change-Id: I36e1524a4e5ecf3c47602fd0b4755f5784db2135
 2020-05-13 19:19:00 +00:00
TreeHugger Robot
eb0bf72db4 Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 am: 1f3678e84c am: 8df500574a am: 3a8961c7ad 
Change-Id: Ia1fbe8284e24fea6ce54f05203b4f75e3123e7c4
 2020-05-13 19:18:02 +00:00
Yifan Hong
6c8a2c82c2 resolve merge conflicts of 7169f754cc to rvc-dev-plus-aosp am: 010d320848 am: b135ae2886 am: 12d8ccf10f 
Change-Id: I200871af54d44ed3fc5b23b4dd87911f9da9b58b
 2020-05-13 19:17:52 +00:00
TreeHugger Robot
3b34c3b913 Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 am: 40a4a04a61 am: 328ee80a64 
Change-Id: I9a135c760d8d24edccb7afccc59beff10846d751
 2020-05-13 19:10:12 +00:00
Yifan Hong
bcf3af8b42 Support forcefully generating non-AB packages. am: 7169f754cc am: 8e6f49d69b am: 4886370d08 
Change-Id: I0c936df45343792af7d25f7919b4dc790de99268
 2020-05-13 19:10:09 +00:00
TreeHugger Robot
2e9a29f0db Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847 am: 40a4a04a61 am: 05f0a7bfd3 
Change-Id: I108d7698087b3bde202080f7c9ad026c6618a2b4
 2020-05-13 18:48:33 +00:00