StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,828 Commits 1 Branch 0 Tags
db537d5eaef68130ec3b7b51a2cd809a57b1caca
Commit Graph

45828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
9dd9173046 Merge "Remove core.mk." into pi-dev-plus-aosp 2018-06-16 10:37:40 +00:00
Colin Cross
28afe0f4a2 Merge "Inject minSdkVersion from the build system" am: 500fccebf7 am: e3ecbd521a 
am: 2d48593d8b

Change-Id: I488c44336c95dbceaf94b04df63a4fecdcc62158
 2018-06-15 23:47:13 -07:00
Colin Cross
2d48593d8b Merge "Inject minSdkVersion from the build system" am: 500fccebf7 
am: e3ecbd521a

Change-Id: I12db4bb8b7ed705d2c8e975fc4c7f62cd765301b
 2018-06-15 22:59:17 -07:00
Colin Cross
e3ecbd521a Merge "Inject minSdkVersion from the build system" 
am: 500fccebf7

Change-Id: I5a9ab05278e8eca255f093f930b8c8913f4ddb91
 2018-06-15 22:42:36 -07:00
Colin Cross
500fccebf7 Merge "Inject minSdkVersion from the build system" 2018-06-15 22:53:52 +00:00
Isaac Chen
84d020b14c Merge "Set proper CPU variant for aosp_arm" am: 7f0ac95d21 am: bd3c40a051 
am: 11f0b07c4f

Change-Id: I10e7d80362ec4fcd825f324b7bc470101f93fb2a
 2018-06-15 15:24:42 -07:00
Isaac Chen
11f0b07c4f Merge "Set proper CPU variant for aosp_arm" am: 7f0ac95d21 
am: bd3c40a051

Change-Id: I0764aa8ab7ca6735a52be240510b9f05bca3643b
 2018-06-15 14:58:12 -07:00
Isaac Chen
bd3c40a051 Merge "Set proper CPU variant for aosp_arm" 
am: 7f0ac95d21

Change-Id: I4708367ced78703ef7b7df08a3f248d7136b06bd
 2018-06-15 14:09:37 -07:00
Colin Cross
7351909619 Merge "Add LOCAL_DONT_MERGE_MANIFESTS" am: 5d80834b32 am: 663d8eea04 
am: 9cddc25545

Change-Id: I34038c531d2ba7e601de62ea4c3c0e261077cee4
 2018-06-15 13:45:03 -07:00
Colin Cross
5b9899afd7 [automerger skipped] Merge "Move merged AndroidManifest.xml file to manifest subdirectory" am: c11f2ff4d5 -s ours am: e41998c124 -s ours 
am: 9a5b4fd718  -s ours

Change-Id: Ib253de1abac2ca0805477127eb4b9894deb79c5c
 2018-06-15 13:42:25 -07:00
Treehugger Robot
7f0ac95d21 Merge "Set proper CPU variant for aosp_arm" 2018-06-15 20:19:10 +00:00
Colin Cross
9cddc25545 Merge "Add LOCAL_DONT_MERGE_MANIFESTS" am: 5d80834b32 
am: 663d8eea04

Change-Id: I202a9f3eed141be804d1d95bf78d98a26850c927
 2018-06-15 12:28:29 -07:00
Colin Cross
9a5b4fd718 [automerger skipped] Merge "Move merged AndroidManifest.xml file to manifest subdirectory" am: c11f2ff4d5 -s ours 
am: e41998c124  -s ours

Change-Id: Idf8556d1a5aa04e54dadb877d78f272787b8dfae
 2018-06-15 12:27:40 -07:00
Isaac Chen
e44b0d96b9 Set proper CPU variant for aosp_arm 
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
Merged-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
(cherry picked from commit b2e58893c3)
 2018-06-15 18:40:42 +00:00
Colin Cross
663d8eea04 Merge "Add LOCAL_DONT_MERGE_MANIFESTS" 
am: 5d80834b32

Change-Id: I9b4ac446d5aa9ddec6e87dac9b1af5cbe9f3d570
 2018-06-15 11:39:41 -07:00
Colin Cross
e41998c124 [automerger skipped] Merge "Move merged AndroidManifest.xml file to manifest subdirectory" 
am: c11f2ff4d5  -s ours

Change-Id: I46b14d739d22670cb26ff339a69c4297be70a648
 2018-06-15 11:39:04 -07:00
Colin Cross
5d80834b32 Merge "Add LOCAL_DONT_MERGE_MANIFESTS" 2018-06-15 18:23:44 +00:00
Treehugger Robot
c11f2ff4d5 Merge "Move merged AndroidManifest.xml file to manifest subdirectory" 2018-06-15 18:19:12 +00:00
Tom Cherry
fedc7110f3 Merge "Always create /vendor/etc/{passwd,group}" am: b6b2d49e23 am: 814c6d2d46 
am: c738421587

Change-Id: I3b6609bd3b6cfe28d61db5fd8f28a4b3e92a8e42
 2018-06-15 10:23:58 -07:00
Tom Cherry
c738421587 Merge "Always create /vendor/etc/{passwd,group}" am: b6b2d49e23 
am: 814c6d2d46

Change-Id: I453dcd416fb088d1313a3fdc3c74b29cfeaf0388
 2018-06-15 10:19:20 -07:00
Tom Cherry
814c6d2d46 Merge "Always create /vendor/etc/{passwd,group}" 
am: b6b2d49e23

Change-Id: Id6b1002ded8d3e9f199dfef9138d9d076d43cd57
 2018-06-15 10:15:11 -07:00
Tom Cherry
b6b2d49e23 Merge "Always create /vendor/etc/{passwd,group}" 2018-06-15 17:04:16 +00:00
Anton Hansson
90bdac882d [automerger skipped] Merge "Remove sdk_base.mk." into pi-dev-plus-aosp 
am: 4c6a34d922  -s ours

Change-Id: Ieca446617b5f43ede1f1479fcd35aad97c8ad4f1
 2018-06-15 09:30:08 -07:00
Anton Hansson
4c6a34d922 Merge "Remove sdk_base.mk." into pi-dev-plus-aosp 2018-06-15 16:20:34 +00:00
Anton Hansson
c00cff4331 Merge "Remove sdk_base.mk." 2018-06-15 16:18:45 +00:00
Anton Hansson
d0d862d794 Remove core.mk. 
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
 2018-06-15 17:10:42 +01:00
Josh Gao
3c4d2b512e Merge "Move pid, stacks from envsetup.sh to dedicated scripts." am: b6a2565382 am: 94f5b94eae 
am: 5ef139b3b0

Change-Id: Icf67904694a44246e7fd764dd3d0e5d49ab22a0b
 2018-06-15 09:05:51 -07:00
Josh Gao
5ef139b3b0 Merge "Move pid, stacks from envsetup.sh to dedicated scripts." am: b6a2565382 
am: 94f5b94eae

Change-Id: I888cb1da62db39c9c4d02396a95d041c46969d87
 2018-06-15 08:58:16 -07:00
Josh Gao
94f5b94eae Merge "Move pid, stacks from envsetup.sh to dedicated scripts." 
am: b6a2565382

Change-Id: Ia2b9f00a6e23edb97368eab0e0cd7be482580a83
 2018-06-15 08:50:37 -07:00
Treehugger Robot
b6a2565382 Merge "Move pid, stacks from envsetup.sh to dedicated scripts." 2018-06-15 15:43:37 +00:00
Anton Hansson
7ebaf04ccf Remove sdk_base.mk. 
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
 2018-06-15 12:44:25 +01:00
Anton Hansson
f65e806618 Remove sdk_base.mk. 
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
 2018-06-15 11:30:45 +01:00
Anton Hansson
e40fd39b39 [automerger skipped] Merge "Move a few packages from core_minimal.mk to base.mk." am: 984e93a450 -s ours am: cd7c4bc589 -s ours 
am: 8f6276985b  -s ours

Change-Id: Iba98e96869299a97fd10eae7a373528da48d580b
 2018-06-15 02:29:27 -07:00
Anton Hansson
acbff33dc3 Merge "Add support enforcing all path requirements." am: 9d2c04e39c am: a062b90c36 
am: e31772e54e

Change-Id: I0cb17b380782968176c988ee9b576776a370c879
 2018-06-15 02:28:37 -07:00
Anton Hansson
8f6276985b [automerger skipped] Merge "Move a few packages from core_minimal.mk to base.mk." am: 984e93a450 -s ours 
am: cd7c4bc589  -s ours

Change-Id: I920548169eda02092535ca240ddaaa4fc0105ea0
 2018-06-15 02:24:17 -07:00
Anton Hansson
e31772e54e Merge "Add support enforcing all path requirements." am: 9d2c04e39c 
am: a062b90c36

Change-Id: I975910cff42a62169d073ca71d942d319acdc19b
 2018-06-15 02:23:33 -07:00
Anton Hansson
cd7c4bc589 [automerger skipped] Merge "Move a few packages from core_minimal.mk to base.mk." 
am: 984e93a450  -s ours

Change-Id: Ieff07a43f0c86fd87b62ae61b7f56b1c74e8cdbd
 2018-06-15 02:19:47 -07:00
Anton Hansson
ae886cd788 [automerger skipped] Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master am: 667d543f87 -s ours 
am: fd125511f0  -s ours

Change-Id: I37c4b2c3ae10427020e06a270e4374388ac6abc3
 2018-06-15 02:19:13 -07:00
Anton Hansson
a062b90c36 Merge "Add support enforcing all path requirements." 
am: 9d2c04e39c

Change-Id: I95c562e020d9995130ff438bdc90f9d5b59128fc
 2018-06-15 02:19:02 -07:00
Anton Hansson
fd125511f0 [automerger skipped] Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master 
am: 667d543f87  -s ours

Change-Id: I5691f2ad3359283ba2f79847a4330042e17f7649
 2018-06-15 02:14:34 -07:00
Anton Hansson
984e93a450 Merge "Move a few packages from core_minimal.mk to base.mk." 2018-06-15 09:08:33 +00:00
Anton Hansson
9d2c04e39c Merge "Add support enforcing all path requirements." 2018-06-15 09:08:10 +00:00
Anton Hansson
667d543f87 Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master 2018-06-15 09:07:30 +00:00
Anton Hansson
66a1b06432 Merge "Move a few packages from core_minimal.mk to base.mk." into pi-dev-plus-aosp 
am: 7afb0b126b

Change-Id: I38e117f9872f9090b021ba3fc72b266e685da6d4
 2018-06-15 02:06:07 -07:00
Anton Hansson
7afb0b126b Merge "Move a few packages from core_minimal.mk to base.mk." into pi-dev-plus-aosp 2018-06-15 08:57:57 +00:00
Colin Cross
34f524a1b0 Merge "Dist installed-files*.json" am: 8b4c72dc1c am: a81e5c743d 
am: 0819d5b4be

Change-Id: Ia9e8ec5a11133ccd0ee593c4adc1175118f96b5b
 2018-06-14 22:37:45 -07:00
Sundong Ahn
9087c3cc89 Merge "Remove com.android.location.provider.xml" am: 1ce8617482 am: b4cb1b542a 
am: e8fe5eb021

Change-Id: I99ba2453bd49b50bc0643f7cdd0889d39794fcd1
 2018-06-14 22:20:13 -07:00
Colin Cross
0819d5b4be Merge "Dist installed-files*.json" am: 8b4c72dc1c 
am: a81e5c743d

Change-Id: Ic84f4933af6431268aca5e5795ecd19090e567fb
 2018-06-14 22:19:27 -07:00
Colin Cross
a81e5c743d Merge "Dist installed-files*.json" 
am: 8b4c72dc1c

Change-Id: I13389075d4b3b87d23a96a194f17163a3ab22b03
 2018-06-14 22:11:16 -07:00
Sundong Ahn
e8fe5eb021 Merge "Remove com.android.location.provider.xml" am: 1ce8617482 
am: b4cb1b542a

Change-Id: I896e015305b33ea12b97abc3d130806726f1cf05
 2018-06-14 22:08:00 -07:00