Commit Graph

45098 Commits

Author SHA1 Message Date
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
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 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 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
Colin Cross 8b4c72dc1c Merge "Dist installed-files*.json" 2018-06-15 05:01:54 +00:00
Sundong Ahn b4cb1b542a Merge "Remove com.android.location.provider.xml"
am: 1ce8617482

Change-Id: I56c7f2d883b00812b92b43e318548bbba4855eb2
2018-06-14 21:52:54 -07:00
Treehugger Robot 1ce8617482 Merge "Remove com.android.location.provider.xml" 2018-06-15 03:41:18 +00:00
Hyunyoung Song 135a5bab0b Fix unbundled branch by not having it pick up goldfish dependency Bug: 110165361
am: 16e7004e3f

Change-Id: I10e70847d78294e1c1470c740049e6881b74161b
2018-06-14 19:19:41 -07:00
Josh Gao a5d53ecd4b Merge "Fix stacks for Java processes." am: 4f22abd334
am: 915be4961e

Change-Id: Ic157ca7a11e2e6444760568285f338b6c4a93b06
2018-06-14 17:45:08 -07:00
Josh Gao 915be4961e Merge "Fix stacks for Java processes."
am: 4f22abd334

Change-Id: I0b4769a10c911c702f7923a9881d75b25536991d
2018-06-14 17:41:30 -07:00
Treehugger Robot 4f22abd334 Merge "Fix stacks for Java processes." 2018-06-15 00:31:07 +00:00
Colin Cross 0ec4fd79ba Move merged AndroidManifest.xml file to manifest subdirectory
am: c7dee5c9a1

Change-Id: Icf49bdf5f4f2b469ce17b3fc427ea3a8ffc7e5eb
2018-06-14 16:17:11 -07:00
Hyunyoung Song 16e7004e3f Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
2018-06-14 16:15:23 -07:00
Josh Gao ab1e09a6b0 Fix stacks for Java processes.
Fix stacks for the change in ANR trace location by using `debuggerd -j`
instead of manually fetching the traces file.

Also, dump zygote/zygote64 as native processes, since they don't
respond to SIGQUIT.

Test: stacks zygote
Test: stacks adbd
Test: stacks com.android.settings
Change-Id: I015458bdc2dd45624940204d42614365aacf8304
2018-06-14 15:35:53 -07:00
Colin Cross 23dded0ffd Dist installed-files*.json
installed-files*.json provides hashes of each file, which will allow
a quick comparison of what has changed between builds.

Test: m checkbuild
Change-Id: I87f6c1fa89aaa83c7bcc7cbefb799e9e26d7bfa5
2018-06-14 14:51:20 -07:00
Colin Cross c7dee5c9a1 Move merged AndroidManifest.xml file to manifest subdirectory
Some modules generate their own custom AndroidManifest.xml file
to $(intermediates.COMMON)/AndroidManifest.xml file.  Move the
build system's location to
$(intermediates.COMMON)/manifest/AndroidManifest.xml.

This location will also be used later for finding manifest files
from LOCAL_STATIC_ANDROID_LIBRARIES dependencies.

Bug: 78447299
Test: m checkbuild
Change-Id: I345f079bdd191451333b38d882418f2f7150b1e9
Merged-In: I345f079bdd191451333b38d882418f2f7150b1e9
(cherry picked from commit 0bcc120b54)
2018-06-14 21:36:53 +00:00
Colin Cross be82c3f859 [automerger skipped] Merge "Use implicit output for prebuilt aar manifests" am: 6021800c45 -s ours
am: 830cb4e884  -s ours

Change-Id: I125a78e5e0c7a13d1f5f4a529a16db914ae1d959
2018-06-14 13:19:15 -07:00
Colin Cross 830cb4e884 [automerger skipped] Merge "Use implicit output for prebuilt aar manifests"
am: 6021800c45  -s ours

Change-Id: Id1c88d15484b2d6a545be0160b5bf51d6e1d3bc6
2018-06-14 13:06:09 -07:00
Treehugger Robot 6021800c45 Merge "Use implicit output for prebuilt aar manifests" 2018-06-14 19:48:37 +00:00
Anton Hansson 3eea079ecf Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

        DownloadProvider
        idmap
        libneuralnetworks
        mdnsd
        MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:40:04 +01:00
Anton Hansson 0a0c4dc6aa Merge "Add a new macro for products to make artifact path requirements." am: 2b0ea222c1
am: 727e5d9f59

Change-Id: I9a8106d3832ba7f885b4b1b1dbe24a1c9b566647
2018-06-14 03:44:53 -07:00
Anton Hansson 727e5d9f59 Merge "Add a new macro for products to make artifact path requirements."
am: 2b0ea222c1

Change-Id: I3bb0f6a885ef190c0eebc5cf73ac748ff25c4afd
2018-06-14 03:39:45 -07:00
Anton Hansson 2b0ea222c1 Merge "Add a new macro for products to make artifact path requirements." 2018-06-14 10:32:43 +00:00
Anton Hansson 165f17dc05 Merge "Extract the product to file mapping logic to a macro." am: df832133ad
am: 6147e61699

Change-Id: I8cdd96417587829d0d2bef76c10f9cb1b830121c
2018-06-14 03:18:35 -07:00
Anton Hansson 6147e61699 Merge "Extract the product to file mapping logic to a macro."
am: df832133ad

Change-Id: Ic92eb8d9c9631f5eaac57bb4f41c157954f85193
2018-06-14 03:14:24 -07:00
Anton Hansson df832133ad Merge "Extract the product to file mapping logic to a macro." 2018-06-14 10:10:42 +00:00
Anton Hansson 58ec3c1018 [automerger skipped] Merge "Dedupe packages in mk's that inherit core_minimal.mk" am: f93d674ac3 -s ours
am: c67a7e0306  -s ours

Change-Id: If3821f48f2378583f56cd02225393ba5b0da5144
2018-06-14 01:12:47 -07:00
Anton Hansson c67a7e0306 [automerger skipped] Merge "Dedupe packages in mk's that inherit core_minimal.mk"
am: f93d674ac3  -s ours

Change-Id: I5db9bab2d74f7ff05d2a37ddcfcbe977dce30e9d
2018-06-14 01:08:37 -07:00
Anton Hansson f93d674ac3 Merge "Dedupe packages in mk's that inherit core_minimal.mk" 2018-06-14 07:57:52 +00:00
Wei Wang 9389b628da Merge "fs_config_generator: use vendor shell for vendor AID" am: 6eb060785b
am: 00fd45aa1b

Change-Id: I855d60396087c7ab5ed6abccb55ba2b5d457ed00
2018-06-13 20:40:12 -07:00
Wei Wang 00fd45aa1b Merge "fs_config_generator: use vendor shell for vendor AID"
am: 6eb060785b

Change-Id: I7e1968eba0ce5941b1f0b9f0c726efcc10ff6df8
2018-06-13 20:37:05 -07:00
Treehugger Robot 6eb060785b Merge "fs_config_generator: use vendor shell for vendor AID" 2018-06-14 03:28:32 +00:00
Sundong Ahn 8970f61d99 Remove com.android.location.provider.xml
The com.android.location.provider.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Change-Id: Idfbc6b09ca4337795277df8b98c73f6fd5865aff
2018-06-14 11:15:20 +09: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
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 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 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 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 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
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
TreeHugger Robot e64b309d22 Merge "emulator: move sepolicy to goldfish project" into pi-dev 2018-06-13 22:19:14 +00:00