Commit Graph

45828 Commits

Author SHA1 Message Date
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
nelsonli
cf28ff56ac Build System: fix autogen_test_config problem
If there happen to be any dependencies added to target of $(test_config),
it'll cause problem in the autogen_config. We fix it by using $< in
the autogen command.

BUG: 109736180
Test: lunch walleye_coverage-userdebug; make adbd_test
Change-Id: I22ab100c5a3f9fa058c1edd66f9e5cfdf5b7f855
2018-06-15 02:34:43 +00:00
Hyunyoung Song
61a596b2b1 Fix unbundled branch by not having it pick up goldfish dependency Bug: 110165361 am: 16e7004e3f
am: 135a5bab0b

Change-Id: Ied6b5613bf191a83017332e228d93256f90f978d
2018-06-14 19:23:02 -07:00
Android Build Merger (Role)
b9f82b2bd5 [automerger] Fix unbundled branch by not having it pick up goldfish dependency Bug: 110165361 am: 16e7004e3f am: 32d24acbe6
Change-Id: I8095680a2c213633701674006ba4421f503b59cc
2018-06-15 02:20:16 +00:00
Hyunyoung Song
32d24acbe6 Fix unbundled branch by not having it pick up goldfish dependency Bug: 110165361
am: 16e7004e3f

Change-Id: I872523157898d18d6813a7399734fcb7af528548
2018-06-14 19:19:41 -07: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
420bde7d60 Merge "Fix stacks for Java processes." am: 4f22abd334 am: 915be4961e
am: a5d53ecd4b

Change-Id: Ie86c00cdfda523c3891e2135be6fbb885d258241
2018-06-14 17:49:19 -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
961cfb5726 [automerger skipped] Move merged AndroidManifest.xml file to manifest subdirectory am: c7dee5c9a1
am: 0ec4fd79ba  -s ours

Change-Id: I80bc6bd51b5e3bc04031bfacf941a68316ecdc45
2018-06-14 16:43:15 -07:00
Josh Gao
896a546663 Move pid, stacks from envsetup.sh to dedicated scripts.
Make it so that these can be used in other scripts by moving them from
functions defined in envsetup.sh to standalone scripts.

Test: stacks zygote64
Change-Id: Id8e5ce5b4da80e57f4226eb34edaf82b87393834
2018-06-14 16:36:56 -07: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
fae93680fa Inject minSdkVersion from the build system
Add a script that can inject a <uses-sdk minSdkVersion=""> into
AndroidManifest.xml files.  This will help with merging
LOCAL_STATIC_ANDROID_LIBRARIES, because ManifestMerger treats
a missing minSdkVersion as minSdkVersion=1 and throws errors
if libraries use a larger minSdkVersion.  It will also help
with cases where an app has a manifest that specifies an old
minSdkVersion, but the build system is compiling the app in
a way that is not compatibile with old devices, for example
using a newer dex format.

Bug: 110167203
Test: m java
Change-Id: Ia60d462e8af9e93c57d75f423207fa8d221b1347
2018-06-14 14:38:54 -07:00
Colin Cross
1d46e8abb4 Add LOCAL_DONT_MERGE_MANIFESTS
Some modules have manifests that ManifestMerger doesn't like, and
don't need manifest merging.  Skip manifest merger if
LOCAL_DONT_MERGE_MANIFESTS is set.

Bug: 78447299
Test: m checkbuild
Change-Id: If1a58253c62e0194a6acfd79930b9bb10978abe5
2018-06-14 14:38:54 -07:00
Colin Cross
e1b4f302e5 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 00a6348e7dfa4fafc308ab92d8e7d06dcfcd01ba)
2018-06-14 14:38:54 -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
TreeHugger Robot
5af768ebba Merge "Move merged AndroidManifest.xml file to manifest subdirectory" 2018-06-14 21:35:22 +00:00
Colin Cross
4598af5d63 [automerger skipped] Merge "Use implicit output for prebuilt aar manifests" am: 6021800c45 -s ours am: 830cb4e884 -s ours
am: be82c3f859  -s ours

Change-Id: I0cfb3f832be34b518fd06f8c6725537c9db44edd
2018-06-14 13:37:54 -07:00
Tom Cherry
53940fd2ba Always create /vendor/etc/{passwd,group}
Previously we only created these if the device set
TARGET_FS_CONFIG_GEN, however there are now other targets that want to
depend on these.  Instead of having those targets conditionally depend
on them, we always create them, defaulting to blank contents (by
reading /dev/null for TARGET_FS_CONFIG_GEN).

Test: builds succeed
Change-Id: Ie95286f5a800d891022eb66cd6fefcc967000c2e
2018-06-14 13:29:32 -07: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
Colin Cross
0bcc120b54 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
2018-06-14 12:49:20 -07:00
Treehugger Robot
6021800c45 Merge "Use implicit output for prebuilt aar manifests" 2018-06-14 19:48:37 +00:00
Anton Hansson
446d9a8cad 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
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 15:43:42 +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
be371e1656 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
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:39:17 +01:00
Anton Hansson
ee26747d5a Merge "Add a new macro for products to make artifact path requirements." am: 2b0ea222c1 am: 727e5d9f59
am: 0a0c4dc6aa

Change-Id: I64def320155b5e3fe4f78314a4c6ffcc22672bef
2018-06-14 03:49:03 -07: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
427d855728 Add support enforcing all path requirements.
Setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to be non-empty will
verify that when an inherited product file makes an path requirement
claim, no files other than the ones it produces are allowed inside its
paths. This allows more rigorous control of what goes where, and
specifically stops accidental inclusion of modules in the wrong places
(which is very easy to do otherwise).

In order to enable iterative improvements to current offenders, support
for a whitelist is also added (via the new
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST property). Verification is
done that this variable corresponds to exactly the list of current
offenders.

Example use:
  PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
  PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := system/priv-app/Dialer/Dialer.apk

Bug: 80410283
Test: In a downstream CL specifying the above.
Change-Id: I58047db08bde34da21759cfc55f398892b1c809a
2018-06-14 11:35:05 +01: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
4952cf1eff Merge "Extract the product to file mapping logic to a macro." am: df832133ad am: 6147e61699
am: 165f17dc05

Change-Id: Ifaef76fcbbb41db6de8ede0c532f781c4cabeb6a
2018-06-14 03:23:26 -07: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
455659bef2 [automerger skipped] Merge "Dedupe packages in mk's that inherit core_minimal.mk" am: f93d674ac3 -s ours am: c67a7e0306 -s ours
am: 58ec3c1018  -s ours

Change-Id: Ibadc9d6515bf5860166d8bb78a8f91796d68e68d
2018-06-14 01:16:56 -07: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
2ba3c8e41f Merge "fs_config_generator: use vendor shell for vendor AID" am: 6eb060785b am: 00fd45aa1b
am: 9389b628da

Change-Id: I8401f25ec9be81643d2cd19a99672b0ddb501743
2018-06-13 20:43:54 -07: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