StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,000 Commits 1 Branch 0 Tags
6dd1058761723e11689af73f7b95f64d1adbcc07
Commit Graph

34000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
04158fac7c Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b 
am: 51c1eeefb3

Change-Id: I5e05a8d69bc1bf02e8831333a1bbe483e13e3227
 2016-12-02 22:09:27 +00:00
Colin Cross
51c1eeefb3 Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" 
am: 1498712a6b

Change-Id: Iec7d58d837879bc4a63818d09881873f56d14779
 2016-12-02 22:00:26 +00:00
Colin Cross
1498712a6b Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" 2016-12-02 21:47:58 +00:00
dcashman
c316783843 Sort SELinux package inclusion. 
This section will be modified as part of splitting these packages into platform
and non-platform components.  Sort them all to avoid conflicts.

Bug: 31363362
Test: Builds
Change-Id: I91fb4d4d7c0a6971a19047ef2eb2981770a122ff
 2016-12-02 09:34:23 -08:00
Marco Nelissen
f515dbff65 Merge "Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 am: 7ea34d3816" into nyc-mr2-dev-plus-aosp 
am: c0e492a42b  -s ours

Change-Id: I9c9425c62a2febab531a4654787c9fe872374776
 2016-12-02 17:29:45 +00:00
Marco Nelissen
b875587899 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 am: 7ea34d3816 
am: b2329c2075  -s ours

Change-Id: I46ceff0a439fc3d1d93a289c33dbbf4bfe93d85b
 2016-12-02 17:29:44 +00:00
Marco Nelissen
d5b7108a87 Merge "DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 am: d787924736" into nyc-mr2-dev-plus-aosp 
am: 82bc4ecd17  -s ours

Change-Id: I50bb51e8fd03ac9ae212273f04c824587663fd97
 2016-12-02 17:29:18 +00:00
Marco Nelissen
0116f73a65 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 am: d787924736 
am: 4c783941b2  -s ours

Change-Id: I2076bd9ba948fd6e4853b6ec3ebcf1114a573d2b
 2016-12-02 17:29:16 +00:00
Marco Nelissen
2882bb5bb3 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 am: edb09ade41 
am: 5307ed732b  -s ours

Change-Id: I227c0d8416d5aeef7ba52a7965103ead0a55172c
 2016-12-02 17:28:57 +00:00
Marco Nelissen
47d53c2b30 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 am: 9b0f2de208 
am: 0b6827f452  -s ours

Change-Id: I09ea574a887c43424638a7030e81e20c2d8c60f3
 2016-12-02 17:28:37 +00:00
Android Build Merger (Role)
c0e492a42b Merge "Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 am: 7ea34d3816" into nyc-mr2-dev-plus-aosp 2016-12-02 17:20:02 +00:00
Marco Nelissen
b2329c2075 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 
am: 7ea34d3816

Change-Id: I7ace7db5a096413517b4691e85da926fe5576dfd
 2016-12-02 17:19:50 +00:00
Android Build Merger (Role)
82bc4ecd17 Merge "DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 am: d787924736" into nyc-mr2-dev-plus-aosp 2016-12-02 17:19:44 +00:00
Marco Nelissen
5307ed732b Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 
am: edb09ade41

Change-Id: Iafb2c7958ec940de00e07eb97018af7a4a9721e4
 2016-12-02 17:15:54 +00:00
Marco Nelissen
4c783941b2 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 
am: d787924736

Change-Id: Id6036ebe2fe0ee9481d37ee5546192afa110cc1d
 2016-12-02 17:14:37 +00:00
Marco Nelissen
0b6827f452 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d am: 85e78564d3 
am: 9b0f2de208

Change-Id: Ic703019e5a7c8bf480f3e4926a30b5cdbf7fb02e
 2016-12-02 17:14:36 +00:00
Marco Nelissen
edb09ade41 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba 
am: 6127b67b64

Change-Id: Ie604d50be0d1805595005eadf49457fca95126f0
 2016-12-02 17:07:23 +00:00
Tao Bao
a62b1ded10 Merge "Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 am: 3014c885b2" into nyc-mr2-dev-plus-aosp 
am: 0607b67a44

Change-Id: Ic077929b6f719dc4a45b2ab4caea3ffe3b796236
 2016-12-02 17:07:23 +00:00
Marco Nelissen
7ea34d3816 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba 
am: 6127b67b64

Change-Id: I793580858f1a041a9257815466179916c93afb7b
 2016-12-02 17:07:23 +00:00
Tao Bao
ee4143134a Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 am: 3014c885b2 
am: e09b1fd78b

Change-Id: I9d210e9a1a99c08bd37cfa26199360e972596525
 2016-12-02 17:07:21 +00:00
Marco Nelissen
d787924736 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d 
am: 85e78564d3

Change-Id: I780666e3c8d45057a8c22d3ac470aeb723093b5e
 2016-12-02 17:07:06 +00:00
Marco Nelissen
9b0f2de208 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d 
am: 85e78564d3

Change-Id: I5ae4cfc8f552b8f9bc94a3546d037ebd716a3d5a
 2016-12-02 17:07:06 +00:00
Tao Bao
06c2d5b9d3 Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 am: f38c5800ca 
am: cf5426161a

Change-Id: I69dbc98179a781c5a7e522009fcbf83eb919f2f8
 2016-12-02 17:07:05 +00:00
Marco Nelissen
6127b67b64 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 
am: 56aa9f17ba

Change-Id: I323162303f0d7d86d6de82aba740fbd50728714f
 2016-12-02 17:00:23 +00:00
Android Build Merger (Role)
0607b67a44 Merge "Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 am: 3014c885b2" into nyc-mr2-dev-plus-aosp 2016-12-02 17:00:15 +00:00
Tao Bao
e09b1fd78b Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 
am: 3014c885b2

Change-Id: I54f91640708be083c8d4789efbbcac8a21f407ca
 2016-12-02 17:00:05 +00:00
Marco Nelissen
85e78564d3 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab 
am: 38ae17c46d

Change-Id: I2f4d64808446f39ef201b6629eeae432276ead6c
 2016-12-02 17:00:05 +00:00
Tao Bao
cf5426161a Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 
am: f38c5800ca

Change-Id: Ia7fa3891246328f053af349064ef61f02710253c
 2016-12-02 17:00:04 +00:00
Marco Nelissen
56aa9f17ba Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 
am: c65b6de802

Change-Id: I76291a36fa5fb74d081432d97c681eafde2caefe
 2016-12-02 16:53:19 +00:00
Marco Nelissen
38ae17c46d DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a 
am: 32711700ab

Change-Id: I0c8041004cd52112234e1ef368bf501262a6668c
 2016-12-02 16:53:05 +00:00
Tao Bao
3014c885b2 Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 
am: eb9de30596

Change-Id: Idd4b559d9d5f16b6e401ec6177036be1be9cb0d6
 2016-12-02 16:53:04 +00:00
Tao Bao
f38c5800ca Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 
am: eb9de30596

Change-Id: I5f9b5d5ab4e4b0702dd110b1e70871b8df2db2df
 2016-12-02 16:53:04 +00:00
Marco Nelissen
c65b6de802 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours 
am: f8dc0c9dc5

Change-Id: Id20a467fc9c4883437cdf22779b6d7466f1b1bcb
 2016-12-02 16:46:48 +00:00
Marco Nelissen
32711700ab DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours 
am: 58c4e2e48a

Change-Id: Iba9549d8886e7b4389dd4b9e7819e0036be27a27
 2016-12-02 16:46:34 +00:00
Tao Bao
eb9de30596 Build recovery-two-step.img for two-step OTAs. 
am: 47ec5ab561

Change-Id: I5288993e010fca9abab66a6aece45a48d1844d43
 2016-12-02 16:46:33 +00:00
Marco Nelissen
f8dc0c9dc5 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 
am: 37d1ec0632  -s ours

Change-Id: I428c6d48643b7237bbbf8104589c210d25eb1055
 2016-12-02 16:39:47 +00:00
Marco Nelissen
58c4e2e48a DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 
am: ac0ca8f326  -s ours

Change-Id: Ie648485e2ee7e77f4cb3d1908e77869aeb60b1b0
 2016-12-02 16:39:32 +00:00
Marco Nelissen
37d1ec0632 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 
am: 22b2728055

Change-Id: I6343efb304a4f1fe2bc91991c91fdf654470a5d5
 2016-12-02 16:32:19 +00:00
Marco Nelissen
ac0ca8f326 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 
am: 7474d313f9

Change-Id: I46a20b65f19a35f5acded84d69f1357cd2505cb5
 2016-12-02 16:32:04 +00:00
Marco Nelissen
22b2728055 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 
am: 6f45a5f721

Change-Id: I8dcd653967d64d937c6668f5ac96ea9b1e318e1f
 2016-12-02 16:24:48 +00:00
Marco Nelissen
7474d313f9 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 
am: 8fc84f4de0

Change-Id: I27c7113fe9835abda40aaccab6d51f77fcfa904f
 2016-12-02 16:24:32 +00:00
Marco Nelissen
6f45a5f721 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours 
am: 0d45d96082

Change-Id: I2e344c35fe0e9ee0b54db9ba27767e933d9ab4b9
 2016-12-02 16:17:49 +00:00
Marco Nelissen
8fc84f4de0 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours 
am: 16ee67f1a7

Change-Id: I0e49eb7e973eed961be9ad4906ab9973f336d53c
 2016-12-02 16:17:32 +00:00
Marco Nelissen
0d45d96082 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 
am: 14d24b3d5f  -s ours

Change-Id: Ic1a6a4a38bb031d1cafe2a464a7376761905f785
 2016-12-02 16:10:18 +00:00
Marco Nelissen
16ee67f1a7 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada 
am: 29ee191947  -s ours

Change-Id: If071ac480c61b67b623127d3642948bfcf43a0de
 2016-12-02 16:10:01 +00:00
Marco Nelissen
14d24b3d5f Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours 
am: 953a9eb3d3

Change-Id: If584daaf9b59531ebc9854003164ef6d7834c931
 2016-12-02 16:03:16 +00:00
Marco Nelissen
29ee191947 DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours 
am: 0c041e9ada

Change-Id: I2e774bf919520af01ba19f570c5d97bc8d6c85b0
 2016-12-02 16:03:01 +00:00
Marco Nelissen
953a9eb3d3 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev 
am: 198262ff83  -s ours

Change-Id: I0a336fa847df3c1375e1263e50723f08635d531f
 2016-12-02 15:55:31 +00:00
Marco Nelissen
0c041e9ada DO NOT MERGE increase generic_mips system partition 
am: 7824073a36  -s ours

Change-Id: I1b60e3cfc39735edfdcc48b215d53e7dac5aa207
 2016-12-02 15:55:30 +00:00
Marco Nelissen
198262ff83 Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev 2016-12-02 15:45:17 +00:00