Anton Hansson
f25a9912fe
[automerger skipped] Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba am: ef2972781c -s ours
...
am: a709e64b8e
2018-06-20 12:05:41 -07:00
Makoto Onuki
83f8440aeb
Merge "Envsetup: Add way to skip installing completions"
...
am: 0816dc15cc
2018-06-20 11:58:00 -07:00
Anton Hansson
763eedc66b
[automerger skipped] Merge "Delete core_tiny.mk"
...
am: 8bc96c162c
2018-06-20 11:57:25 -07:00
Anton Hansson
a709e64b8e
[automerger skipped] Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba
...
am: ef2972781c
2018-06-20 11:55:31 -07:00
Anton Hansson
3bd16efcd1
[automerger skipped] Merge "Remove core.mk." into stage-aosp-master am: 9c96dcaa87 -s ours
...
am: 9c4ad76149
2018-06-20 10:51:17 -07:00
Anton Hansson
9c4ad76149
[automerger skipped] Merge "Remove core.mk." into stage-aosp-master
...
am: 9c96dcaa87
2018-06-20 10:47:09 -07:00
Anton Hansson
9c96dcaa87
Merge "Remove core.mk." into stage-aosp-master
2018-06-20 17:40:44 +00:00
Anton Hansson
f8878d86f9
[automerger skipped] Merge "Remove sdk_base.mk." into stage-aosp-master am: e9d34eccf3 -s ours
...
am: 1021794786
2018-06-20 10:35:41 -07:00
Makoto Onuki
0816dc15cc
Merge "Envsetup: Add way to skip installing completions"
2018-06-20 17:32:50 +00:00
Anton Hansson
1021794786
[automerger skipped] Merge "Remove sdk_base.mk." into stage-aosp-master
...
am: e9d34eccf3
2018-06-20 10:32:34 -07:00
Anton Hansson
e9d34eccf3
Merge "Remove sdk_base.mk." into stage-aosp-master
2018-06-20 17:27:29 +00:00
Tom Cherry
04c7e71ecc
Merge "Verify init scripts for correctness during build" am: 8075746865 am: cd7535c00d
...
am: a9b11b3337
2018-06-20 10:17:17 -07:00
Anton Hansson
8bc96c162c
Merge "Delete core_tiny.mk"
2018-06-20 17:15:53 +00:00
Tom Cherry
a9b11b3337
Merge "Verify init scripts for correctness during build" am: 8075746865
...
am: cd7535c00d
2018-06-20 10:13:08 -07:00
Anton Hansson
ef2972781c
Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba
...
* changes:
Remove core.mk.
Remove sdk_base.mk.
emulator: add host tools to sdk_phone_x86/64
emulator: base sdk_phone_x86/64 images on aosp
2018-06-20 17:12:04 +00:00
Dan Willemsen
1884c0b5b8
Merge "aosp_x86_arm builds have overriding commands" am: 6ae08c1416 am: 93e1a187c7
...
am: 9bc1da527f
2018-06-20 10:10:52 -07:00
Dan Willemsen
c8c1de0fa8
Merge "Fix UML build" am: d7c3dd8a0d am: 4f38769dd0
...
am: 23642157a2
2018-06-20 10:09:50 -07:00
Tom Cherry
cd7535c00d
Merge "Verify init scripts for correctness during build"
...
am: 8075746865
2018-06-20 10:09:01 -07:00
Dan Willemsen
9bc1da527f
Merge "aosp_x86_arm builds have overriding commands" am: 6ae08c1416
...
am: 93e1a187c7
2018-06-20 10:07:11 -07:00
Dan Willemsen
23642157a2
Merge "Fix UML build" am: d7c3dd8a0d
...
am: 4f38769dd0
2018-06-20 10:06:31 -07:00
Tom Cherry
8075746865
Merge "Verify init scripts for correctness during build"
2018-06-20 17:06:11 +00:00
Dan Willemsen
93e1a187c7
Merge "aosp_x86_arm builds have overriding commands"
...
am: 6ae08c1416
2018-06-20 10:03:54 -07:00
Dan Willemsen
4f38769dd0
Merge "Fix UML build"
...
am: d7c3dd8a0d
2018-06-20 10:02:27 -07:00
Treehugger Robot
6ae08c1416
Merge "aosp_x86_arm builds have overriding commands"
2018-06-20 16:53:56 +00:00
Treehugger Robot
d7c3dd8a0d
Merge "Fix UML build"
2018-06-20 16:53:02 +00:00
Tao Bao
db537d5eae
Merge "releasetools: Factor out the check for (compressed) APK file." am: 2ba547a1c7 am: 023b5104d7
...
am: dae65898f2
2018-06-20 09:25:17 -07:00
Tao Bao
dae65898f2
Merge "releasetools: Factor out the check for (compressed) APK file." am: 2ba547a1c7
...
am: 023b5104d7
2018-06-20 09:21:36 -07:00
Tao Bao
023b5104d7
Merge "releasetools: Factor out the check for (compressed) APK file."
...
am: 2ba547a1c7
2018-06-20 09:18:56 -07:00
Tao Bao
2ba547a1c7
Merge "releasetools: Factor out the check for (compressed) APK file."
2018-06-20 16:11:04 +00:00
Anton Hansson
236a99f1e1
[automerger skipped] Merge "Delete core_tiny.mk" into stage-aosp-master am: b40cd42eeb -s ours
...
am: 8893989a9f
2018-06-20 07:16:03 -07:00
Anton Hansson
8893989a9f
[automerger skipped] Merge "Delete core_tiny.mk" into stage-aosp-master
...
am: b40cd42eeb
2018-06-20 07:12:55 -07:00
Anton Hansson
d4f0e3c40d
[automerger skipped] Merge "Delete core_tiny.mk" into pi-dev-plus-aosp
...
am: 50143ef065
2018-06-20 07:11:09 -07:00
Anton Hansson
767e8b181f
[automerger skipped] Delete core_tiny.mk
...
am: 552dcaf7d9
2018-06-20 07:10:23 -07:00
Anton Hansson
a7b36449eb
Delete core_tiny.mk
...
There are no descendants of this mk in AOSP. Move the content that was
shared with core_minimal.mk to base.mk (ContactsProvider and
DefaultContainerService)
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-20 15:09:41 +01:00
Anton Hansson
b40cd42eeb
Merge "Delete core_tiny.mk" into stage-aosp-master
2018-06-20 14:07:14 +00:00
Anton Hansson
50143ef065
Merge "Delete core_tiny.mk" into pi-dev-plus-aosp
2018-06-20 14:02:40 +00:00
Anton Hansson
19fc0e3c2b
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
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit 57000e3c79
2018-06-20 14:42:30 +01:00
Anton Hansson
52b38791b7
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
(cherry picked from commit f65e806618
2018-06-20 14:42:02 +01:00
Anton Hansson
11be1c27dd
Merge "Delete core_tiny.mk"
2018-06-20 13:37:35 +00:00
bohu
68606832c0
emulator: add host tools to sdk_phone_x86/64
...
Fix sdk_x86-sdk build breakage that requires host tools.
BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
Merged-In: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
(cherry picked from commit 62d494b3fd
2018-06-20 14:34:50 +01:00
Anton Hansson
57000e3c79
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
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit d0d862d794
2018-06-20 13:18:00 +00:00
Anton Hansson
f65def6aa9
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
(cherry picked from commit f65e806618
2018-06-20 13:14:48 +00:00
bohu
1829eb172e
emulator: base sdk_phone_x86/64 images on aosp
...
BUG: 79941736
this cl only impacts emulator images
Test: lunch sdk_phone_x86; m; emulator boots
Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
(cherry picked from commit c5e25e9b84
2018-06-20 14:11:32 +01:00
Jiyong Park
d8222c1a3d
Merge "Export SDK library names" am: dabf1a0c5a am: 56be041198
...
am: 66c27e5411
2018-06-20 01:40:09 -07:00
Bo Hu
866af5afae
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""" am: 9379de6756 am: c2c164504d
...
am: 33b7ff0347
2018-06-20 01:38:55 -07:00
Jiyong Park
66c27e5411
Merge "Export SDK library names" am: dabf1a0c5a
...
am: 56be041198
2018-06-20 01:27:05 -07:00
Bo Hu
33b7ff0347
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""" am: 9379de6756
...
am: c2c164504d
2018-06-20 01:25:40 -07:00
Jiyong Park
56be041198
Merge "Export SDK library names"
...
am: dabf1a0c5a
2018-06-20 01:14:56 -07:00
Bo Hu
c2c164504d
Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
...
am: 9379de6756
2018-06-20 01:14:00 -07:00
Dan Willemsen
5250840358
aosp_x86_arm builds have overriding commands
...
This product has warnings about overriding build commands, which means
that there are multiple instructions on how to build a file, and we've
just picked one of them. Which one we pick is usually stable, but it can
change.
Bug: 77611511
Test: turn default to false, aosp_x86_arm still uses a warning
Change-Id: Id821c04e3dd6a1f69ea748827c3570a751b4e1dd
2018-06-19 23:25:16 -07:00
