Commit Graph

45828 Commits

Author SHA1 Message Date
bohu
d42b5b7804 Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev am: 80ca83c41f
am: 5098f6374c

Change-Id: Ib33acd8dd212cee227d2c0a81dd344e0c647f5c1
2018-06-13 18:58:52 -07:00
Android Build Merger (Role)
f499dc9856 [automerger] Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev am: 80ca83c41f am: 0404189064
Change-Id: I83304f12b3f2b691cbbc56d53f7e7b703a352745
2018-06-14 01:54:57 +00:00
bohu
5098f6374c Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev
am: 80ca83c41f

Change-Id: I3c1ac298ca5c2d2f8ce564f0b16e13910210d6f0
2018-06-13 18:54:27 -07:00
bohu
0404189064 Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev
am: 80ca83c41f

Change-Id: If0b664ab20d7f24242bf3d36d3061df49b140f87
2018-06-13 18:54:25 -07:00
TreeHugger Robot
80ca83c41f Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev 2018-06-14 01:49:08 +00:00
Steven Moreland
3a1d781c69 Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir" am: ea01e649d7 am: cb69c58b56
am: 029a4bce8d

Change-Id: I279d2c2a8f14c9017e6e065a506ea3fede4d275e
2018-06-13 18:20:16 -07:00
Steven Moreland
029a4bce8d Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir" am: ea01e649d7
am: cb69c58b56

Change-Id: I0c0eb847796abccc6de635fd51ae45019604ecae
2018-06-13 18:11:58 -07:00
Steven Moreland
cb69c58b56 Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir"
am: ea01e649d7

Change-Id: I06374b11b837fad4d6e1824ba1b99b1a109c7763
2018-06-13 18:08:50 -07:00
Treehugger Robot
ea01e649d7 Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir" 2018-06-14 00:58:52 +00:00
Jiyong Park
df6a6dbbb9 Merge "Support shared library in recovery mode" am: 2371a7d60e am: 1d46a3395f
am: eed93f02c7

Change-Id: Id7c6db10f27f94bea2ad9f471fa987135048afb6
2018-06-13 17:46:18 -07:00
Jiyong Park
eed93f02c7 Merge "Support shared library in recovery mode" am: 2371a7d60e
am: 1d46a3395f

Change-Id: I116ff08c5df560cf675be5d5fb82fdb835566979
2018-06-13 17:06:28 -07:00
Bo Hu
638a5cb3aa [automerger skipped] Merge "emulator: move sepolicy to goldfish project" am: 82de42067e -s ours am: 0b2136ad0c -s ours
am: d3228dc901  -s ours

Change-Id: I490adebde12390ad65b1975e920c5489e6ea4089
2018-06-13 17:06:05 -07:00
bohu
0d29b2db97 [automerger skipped] Merge "emulator: move sepolicy to goldfish project" into pi-dev am: e64b309d22 -s ours
am: 95c2534baf  -s ours

Change-Id: I63be064b676add0fc1b6ba4923d7d9b687aca7ba
2018-06-13 16:51:38 -07:00
Bo Hu
d3228dc901 [automerger skipped] Merge "emulator: move sepolicy to goldfish project" am: 82de42067e -s ours
am: 0b2136ad0c  -s ours

Change-Id: Idf5824d860d87720ed98082eb1a81da3eaec7c9a
2018-06-13 16:47:55 -07:00
Jiyong Park
1d46a3395f Merge "Support shared library in recovery mode"
am: 2371a7d60e

Change-Id: I1e4520c8a2663476bd3924aeca1cf5183240dbf7
2018-06-13 16:38:49 -07:00
Bo Hu
0b2136ad0c [automerger skipped] Merge "emulator: move sepolicy to goldfish project"
am: 82de42067e  -s ours

Change-Id: Ibde91d67dc1d193e3cff944ee9134ff39f87c3a3
2018-06-13 16:14:51 -07:00
Treehugger Robot
2371a7d60e Merge "Support shared library in recovery mode" 2018-06-13 23:14:29 +00:00
bohu
95c2534baf [automerger skipped] Merge "emulator: move sepolicy to goldfish project" into pi-dev
am: e64b309d22  -s ours

Change-Id: Iecf96a3fc2caa713b9cdfd9640bb617873e6e80b
2018-06-13 16:09:15 -07:00
bohu
06e019542e [automerger skipped] emulator: move sepolicy to goldfish project am: 0d749a7a3e -s ours
am: 13986f55af  -s ours

Change-Id: I79bcf228064cb35951608ecd4bd2348dd6a3b233
2018-06-13 16:04:44 -07:00
bohu
d545560961 emualtor: cleanup media configuration am: d7dd3e2d3d
am: a89ee59b13

Change-Id: I6546fda5e346d32cd7907db2baf7f59e6dba4b31
2018-06-13 16:02:45 -07:00
bohu
13986f55af [automerger skipped] emulator: move sepolicy to goldfish project
am: 0d749a7a3e  -s ours

Change-Id: I70e7001f7eb469d8483d954d64ee36488be93c91
2018-06-13 16:02:39 -07:00
bohu
a89ee59b13 emualtor: cleanup media configuration
am: d7dd3e2d3d

Change-Id: I86c7507d4c850f1d03710b03f5a52aa50fe1d6df
2018-06-13 16:01:39 -07:00
Android Build Merger (Role)
d27deb4fc5 [automerger] Merge "emulator: move sepolicy to goldfish project" into pi-dev am: e64b309d22 am: 8c6e12b071
Change-Id: I2c12617deb684771e2d075dca184cdbf175d6780
2018-06-13 23:00:00 +00:00
bohu
8c6e12b071 Merge "emulator: move sepolicy to goldfish project" into pi-dev
am: e64b309d22

Change-Id: I21c4b79326e062ab7ea488d994520fa8ab1d97b3
2018-06-13 15:59:17 -07:00
Android Build Merger (Role)
f249ced167 [automerger] emualtor: cleanup media configuration am: d7dd3e2d3d am: 4cf7715bab
Change-Id: If6fae38c988be3d60602f3b2f22133b638734e37
2018-06-13 22:58:08 +00:00
bohu
4cf7715bab emualtor: cleanup media configuration
am: d7dd3e2d3d

Change-Id: I7de94505e735d1d110a0293c6f908d7323adb5d7
2018-06-13 15:57:44 -07:00
Steven Moreland
3b99ecfbab mma in dirs w/o Android.(mk|bp) in ancestor dir
Many Android.bp files are now no longer needed (since they
are all scanned and subdirs are deprecated), so there are many
places in a tree where they aren't hit.

This still suffers from one bug, given this directory structure:
 A/B/Android.bp
 A/B/C/D/Android.bp
 A/B/C/
 A/B/C/E/Android.bp

if you call 'mma' from 'A/B/C', then it will make
MODULES-IN-A-B.

However, for now, this change makes it so given the following
directory structure:
 A/B/C/D/Android.bp
 A/B/C/
 A/B/C/E/Android.bp

if you call 'mma' from 'A/B/C', then it will make
MODULES-IN-A-B-C as expected (since there are no makefiles in
parent directories). This is the expected behavior in this case
and it is common in directories where Android.bps have been
removed (since they only referenced subdirs) or outside of
git projects.

The reason why this usecase is supported is so that given this:
A/B/C/D/Android.bp
A/B/C/D/include/D/foo.h

You can, from A/B/C/D/include/D/ (for instance) do an mma, and
it will still make the modules defined in A/B/C/D/ which are
presumably related to this.

This change doesn't fix mm or other binaries. In the long term,
either we should just consider mma to make the current directory
(and not look for parent directories for the above 'feature') or
we should move more of the complexity in the build system itself
so that it can intelligently find the first parent directory
which contains a makefile in a subdirectory.

Fixes: 65407300
Test: mma from following dirs
    system/tools/hidl/test/hash_test/bad/hash/1.0 MODULES-IN-system-tools-hidl-test-hash_test
    system/tools/hidl/test/hash_test/             MODULES-IN-system-tools-hidl-test-hash_test
    system/                                       MODULES-IN-system
    hardware/ril/                                 MODULES-IN-hardware-ril

Change-Id: I072d3f382d40cd360ec3d14f8f5b060a4bde9289
2018-06-13 15:34:19 -07:00
bohu
feba4c99ea [automerger skipped] Merge "emulator: move sepolicy to goldfish project" into stage-aosp-master am: eedde11916
am: 2092dd39b8  -s ours

Change-Id: Id510b473bb254cc589da79b3f3cf15600c70902b
2018-06-13 15:28:11 -07:00
Colin Cross
efcc51733c [automerger skipped] Use implicit output for prebuilt aar manifests am: 93fbe84314
am: 3aae834cee  -s ours

Change-Id: Ibd8aa1641f9007b70a081f2bc5051ed26e4e3f2b
2018-06-13 15:27:18 -07:00
TreeHugger Robot
e64b309d22 Merge "emulator: move sepolicy to goldfish project" into pi-dev 2018-06-13 22:19:14 +00:00
Bo Hu
82de42067e Merge "emulator: move sepolicy to goldfish project" 2018-06-13 22:14:32 +00:00
bohu
d7dd3e2d3d emualtor: cleanup media configuration
The media configuration is handled by goldfish/vendor.mk
already; clean them up from device.mk files.

this cl does not impact arm devices;
and it does the right thing for x86/64 devices
because the media configuration should go to vendor
instead of staying on system

BUG: 110030159
Change-Id: If492f1e01f600b1c969e9ef04598f7af6783970e
2018-06-13 22:10:51 +00:00
bohu
0d749a7a3e emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

this cl does not impact real devices, as the selinux
rules are for emulator only

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 22:09:24 +00:00
bohu
2092dd39b8 Merge "emulator: move sepolicy to goldfish project" into stage-aosp-master
am: eedde11916

Change-Id: Ib4d404482f7a617a02a147ad378321469e8ee733
2018-06-13 15:05:39 -07:00
Colin Cross
3aae834cee Use implicit output for prebuilt aar manifests
am: 93fbe84314

Change-Id: I1d43a84b50fb58b2387ff7c97b9290170c35a878
2018-06-13 14:58:52 -07:00
TreeHugger Robot
eedde11916 Merge "emulator: move sepolicy to goldfish project" into stage-aosp-master 2018-06-13 21:56:17 +00:00
Colin Cross
93fbe84314 Use implicit output for prebuilt aar manifests
Remove my_full_libs_manifest_deps by making AndroidManifest.xml an
implicit output of the prebuilt aar unzipping rule.

Bug: 78447299
Test: m checkbuild
Change-Id: I26934d16fd646d45bf57c9527dbb191112cb627b
Merged-In: I26934d16fd646d45bf57c9527dbb191112cb627b
(cherry picked from commit 2b5829e1a6)
2018-06-13 20:41:18 +00:00
TreeHugger Robot
34f0bedd98 Merge "Use implicit output for prebuilt aar manifests" 2018-06-13 20:34:29 +00:00
TreeHugger Robot
040c75ff95 Merge "emulator: move sepolicy to goldfish project" 2018-06-13 20:23:20 +00:00
bohu
4abeb75f32 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 12:45:47 -07:00
Colin Cross
5c1a27f30f Use implicit output for prebuilt aar manifests
Remove my_full_libs_manifest_deps by making AndroidManifest.xml an
implicit output of the prebuilt aar unzipping rule.

Bug: 78447299
Test: m checkbuild
Change-Id: I26934d16fd646d45bf57c9527dbb191112cb627b
Merged-In: I26934d16fd646d45bf57c9527dbb191112cb627b
(cherry picked from commit 2b5829e1a6)
2018-06-13 12:34:51 -07:00
Colin Cross
2b5829e1a6 Use implicit output for prebuilt aar manifests
Remove my_full_libs_manifest_deps by making AndroidManifest.xml an
implicit output of the prebuilt aar unzipping rule.

Bug: 78447299
Test: m checkbuild
Change-Id: I26934d16fd646d45bf57c9527dbb191112cb627b
2018-06-13 19:20:48 +00:00
Chih-hung Hsieh
5bb3a51912 Merge "Third try to enable clang lld as default linker." am: 504656816d am: 378da0f328
am: 0118d2e3b3

Change-Id: Ia6b2e157fd9e6454b2821cc2af21a0e0a6c1fa5f
2018-06-13 11:45:58 -07:00
Chih-hung Hsieh
0118d2e3b3 Merge "Third try to enable clang lld as default linker." am: 504656816d
am: 378da0f328

Change-Id: I4e2f43ff662468800be8dd0d44cea971a1eeb9f6
2018-06-13 11:37:25 -07:00
bohu
4001858313 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 18:37:16 +00:00
Chih-hung Hsieh
378da0f328 Merge "Third try to enable clang lld as default linker."
am: 504656816d

Change-Id: I5a1cf295ec14a0c21d88225fc8ef83b0424fb8ec
2018-06-13 11:32:14 -07:00
bohu
780692fe61 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 11:30:30 -07:00
Chih-hung Hsieh
504656816d Merge "Third try to enable clang lld as default linker." 2018-06-13 18:21:03 +00:00
Anton Hansson
6e21fe705d Merge "Dedupe packages in mk's that inherit core_minimal.mk" into stage-aosp-master am: fc2778040a
am: 22f53eb2f4

Change-Id: I5fcdda9e91792e8cc30166513cff7da40c0282e8
2018-06-13 11:17:06 -07:00
Anton Hansson
22f53eb2f4 Merge "Dedupe packages in mk's that inherit core_minimal.mk" into stage-aosp-master
am: fc2778040a

Change-Id: I9d6a54e207ed137ab7630b77d3fa940b89e47829
2018-06-13 11:09:34 -07:00