Commit Graph

46067 Commits

Author SHA1 Message Date
allenhair
43f7e1c60b Merge "Distribute XML formatted API files as part of the coverage build." am: f2365aa2c5 am: 2e627d5e7d
am: 999e7d80df

Change-Id: I921113cb30b5933d23d6d4243843d1a6081cb692
2018-06-21 12:01:14 -07:00
allenhair
999e7d80df Merge "Distribute XML formatted API files as part of the coverage build." am: f2365aa2c5
am: 2e627d5e7d

Change-Id: I8178722a639e711fa5433bd71f3513b7a100ce62
2018-06-21 11:56:58 -07:00
allenhair
2e627d5e7d Merge "Distribute XML formatted API files as part of the coverage build."
am: f2365aa2c5

Change-Id: I91c661d74e617f17553f27a39cb32496dd5acf4c
2018-06-21 11:52:01 -07:00
allenhair
f2365aa2c5 Merge "Distribute XML formatted API files as part of the coverage build." 2018-06-21 18:33:25 +00:00
Tom Cherry
fc97764dd5 Reland: Verify init scripts for correctness during build
Relanding with change to not run on the darwin build since host init
verifier is not possible there.

Bug: 36970783
Bug: 110477913
Test: builds pass without failures
Test: builds fail with failures in init files used via LOCAL_INIT_RC,
      PRODUCT_COPY_FILES, or TARGET_PREBUILT

Change-Id: Iae93705a9320159ed97328e615eaa3bc150e6442
2018-06-21 11:16:25 -07:00
TreeHugger Robot
d8f86ae1fe Merge "Add emulator audio policy config in /vendor not /system" 2018-06-21 18:08:50 +00:00
Steven Moreland
52971ca09b Remove vr_hwc from GSI image.
Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.

Bug: 109913118
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
2018-06-21 10:15:53 -07:00
Dan Willemsen
8b9c3cc54b Mark export/unexport as deprecated
Make it so that `export`/`unexport` are deprecated during product
configuration, but obsolete during Android.mk parsing (and later in the
build, since we can't un-obsolete it).

Remove some ccache / goma exports, those don't need to be exports, since
soong_ui asks about them explicitly. They also only run doing the
initial project configuration, so we don't run anything with that
environment.

Bug: 73959648
Test: m nothing
Test: build_test on all downstream branches
Change-Id: I55a749f46775660439ae57e881a02c914e83de16
2018-06-21 10:12:23 -07:00
Dan Willemsen
94bff7ae22 Add more BUILD_BROKEN_* logic
Make the values tristate, so that we can differentiate set vs not in
scripts that parse the logs.

Also add some placeholders for warnings that I expect to turn into
errors.

Test: Set BUILD_BROKEN_PHONY_TARGETS to "foo"
Change-Id: I3f7e1e0f85dcef84d6461fc40bdd83dc5bf75ff7
2018-06-21 10:12:23 -07:00
Dan Willemsen
f012f15069 Merge "apidiff: Depend on timestamp file instead of phony target" into stage-aosp-master am: 8d49943c20
am: 5d774728e1

Change-Id: I45a341fcd4f9f02193ff8b8d3029855004184ecd
2018-06-20 22:49:39 -07:00
Dan Willemsen
5d453bdb63 Merge "Deprecate implicit make rules" am: 6d3acda913 am: 45883d45ec
am: 5e4584439e

Change-Id: I1318c0bc83eb28b00ba4c25fa50e81ca1cead2d0
2018-06-20 22:29:05 -07:00
Jiyong Park
c0f738c974 check-vndk-list is run even when VNDK is not enabled
check-vndk-list has not been run when VNDK is not enabled (i.e.
BOARD_VNDK_VERSION is unset). This was problematic because there is a
chance that a CL which passed pre-submit tests can fail the post-submit
tests when the targets selected for the pre-submit tests are all without
VNDK enforcement.

In order to prevent the case, check-vndk-list is executed regardless of
whether BOARD_VNDK_VERSION is set or not.

Bug: 110424280
Test: m -j on sailfish
Test: m -j on sailfish fails after adding an arbitrary library to VNDK
Change-Id: Ia7427be2a297940a9e9c9f46cb058245596171c9
2018-06-21 14:18:54 +09:00
Dan Willemsen
5d774728e1 Merge "apidiff: Depend on timestamp file instead of phony target" into stage-aosp-master
am: 8d49943c20

Change-Id: I34e5a3cd4349b94099c3b1175043ea5ada47aeda
2018-06-20 22:14:54 -07:00
TreeHugger Robot
8d49943c20 Merge "apidiff: Depend on timestamp file instead of phony target" into stage-aosp-master 2018-06-21 05:03:16 +00:00
Dan Willemsen
5e4584439e Merge "Deprecate implicit make rules" am: 6d3acda913
am: 45883d45ec

Change-Id: Ifbbec64ab1a30e1b71eef493800cc5165446f12c
2018-06-20 21:39:46 -07:00
Dan Willemsen
45883d45ec Merge "Deprecate implicit make rules"
am: 6d3acda913

Change-Id: Ic04398750a692d3bbae34b78420d61c6e5ee2356
2018-06-20 21:13:33 -07:00
Treehugger Robot
6d3acda913 Merge "Deprecate implicit make rules" 2018-06-21 03:31:11 +00:00
Dan Willemsen
8f607e31fa apidiff: Depend on timestamp file instead of phony target
Instead of $(LOCAL_MODULE)-docs, use $(call
doc-timestamp-for,$(LOCAL_MODULE)), which is how the *-docs targets are
generated in droiddoc.mk

Test: m offline-sdk-referenceonly-diff
Change-Id: I1e5ee3b819c0e836089fac236e977642067d148a
2018-06-21 02:14:36 +00:00
Colin Cross
e46727a2ba Run ErrorProne in OpenJDK9
Run ErrorProne as a processor in javac from OpenJDK9.

Bug: 69485063
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I2dde597430b47c440df22d248809233a6ade1625
2018-06-20 18:49:50 -07:00
Dan Willemsen
62db0f0945 Deprecate implicit make rules
Test: mm
Test: view docs in gitiles
Change-Id: I1ced4b4218c733b5b5b771d626b20eb6fb22f0df
2018-06-20 16:52:10 -07:00
Colin Cross
47345afae6 [automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" am: 375d9618f6 -s ours am: 85f4272790 -s ours
am: 64dd61d03f  -s ours

Change-Id: I0ddf527c6d3c0be29238885f20422b2b621d9b5d
2018-06-20 16:46:05 -07:00
Tao Bao
48e2c8aac1 Merge "releasetools: Skip signing APKs with given prefixes." am: 8acf3c302b am: 8012498f79
am: 9ec07ab79b

Change-Id: I3411f56a6a485ec58f1ad14672f8cc1b208db6b7
2018-06-20 16:44:36 -07:00
Colin Cross
64dd61d03f [automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" am: 375d9618f6 -s ours
am: 85f4272790  -s ours

Change-Id: Ic35abc8abd212973d6cac7432cc0f60b3f7f63bc
2018-06-20 16:42:12 -07:00
Tao Bao
9ec07ab79b Merge "releasetools: Skip signing APKs with given prefixes." am: 8acf3c302b
am: 8012498f79

Change-Id: I9b7a5fff138fe3d2a22394e7ec01fd8061bc94a9
2018-06-20 16:41:24 -07:00
Colin Cross
9471adc8ed [automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" into stage-aosp-master am: fd52b25254
am: 23ad8dd347  -s ours

Change-Id: If4fcdac09bd768e05e5a43933e96b746da99036e
2018-06-20 16:38:27 -07:00
Colin Cross
85f4272790 [automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests"
am: 375d9618f6  -s ours

Change-Id: Ia4fdb2bfd96ed04a854cd1769b4a2755d2d4fae8
2018-06-20 16:36:47 -07:00
Tao Bao
8012498f79 Merge "releasetools: Skip signing APKs with given prefixes."
am: 8acf3c302b

Change-Id: Ie8f30d2c4e95c047653ca7120c62571df9f14842
2018-06-20 16:36:02 -07:00
Colin Cross
23ad8dd347 Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" into stage-aosp-master
am: fd52b25254

Change-Id: If85e5646cf17a9f00e27c538f079bc9bf32bfd62
2018-06-20 16:35:32 -07:00
Colin Cross
375d9618f6 Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" 2018-06-20 23:24:52 +00:00
Colin Cross
fd52b25254 Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" into stage-aosp-master 2018-06-20 23:24:05 +00:00
Tao Bao
8acf3c302b Merge "releasetools: Skip signing APKs with given prefixes." 2018-06-20 23:23:33 +00:00
Yifan Hong
679f92795c Merge "Revert "Verify init scripts for correctness during build"" am: 560890b29f am: d76c44b72f
am: 222c32a709

Change-Id: Ia412a89cf6378b30f60ea1aeba7e6f215ecdff00
2018-06-20 16:14:30 -07:00
Yifan Hong
222c32a709 Merge "Revert "Verify init scripts for correctness during build"" am: 560890b29f
am: d76c44b72f

Change-Id: I164922253c75875733ca2e4899fd065a9306cfb5
2018-06-20 16:10:21 -07:00
Yifan Hong
d76c44b72f Merge "Revert "Verify init scripts for correctness during build""
am: 560890b29f

Change-Id: I5f69d68b9b604ba76a5bf4fa0a9fd453f62ccde6
2018-06-20 16:03:47 -07:00
Yifan Hong
560890b29f Merge "Revert "Verify init scripts for correctness during build"" 2018-06-20 22:56:39 +00:00
Tom Cherry
d15e50022f Revert "Verify init scripts for correctness during build"
This reverts commit 03303f97be.

Reason for revert: Mac build

Change-Id: Iadd76491307534fde81d3d917876c603a0658fb9
2018-06-20 22:45:14 +00:00
Yifan Hong
c2ae96b56e [automerger skipped] Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests" am: 562a82f521 -s ours am: dd9e7e8ddb -s ours
am: a570f5ecc5  -s ours

Change-Id: I549fa6be1b8566a778701c104d773e4f4b815e55
2018-06-20 15:43:18 -07:00
Yifan Hong
a570f5ecc5 [automerger skipped] Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests" am: 562a82f521 -s ours
am: dd9e7e8ddb  -s ours

Change-Id: I87834eb2b5228fdd1abafe5e463c67b3a7a08ce4
2018-06-20 15:34:05 -07:00
Yifan Hong
dd9e7e8ddb [automerger skipped] Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests"
am: 562a82f521  -s ours

Change-Id: I38c8b726fc1aa7551af2329c6d1355a42f4744a6
2018-06-20 15:25:29 -07:00
Treehugger Robot
562a82f521 Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests" 2018-06-20 22:11:53 +00:00
Allen Hair
906da1b5df Distribute XML formatted API files as part of the coverage build.
Bug: 110485176
Test: m -j32 droid dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true tests
Change-Id: I151afde05de832cab06421ffe0829f07e60aceb8
2018-06-20 14:59:57 -07:00
Colin Cross
8e92179552 Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests
Pass LOCAL_STATIC_ANDROID_LIBRARIES to ManifestMerger, and copy
manifests for prebuilts AARs and static android libraries to
$(intermediates.COMMON)/manifest/AndroidManifest.xml.

Bug: 78447299
Test: m java
Change-Id: I02ac29d3445fcd591101ff0ce215e60dd0997224
Merged-In: I02ac29d3445fcd591101ff0ce215e60dd0997224
(cherry picked from commit 1c87e71e84)
2018-06-20 21:06:44 +00:00
Colin Cross
6cdcc694a1 Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" 2018-06-20 21:06:23 +00:00
Tao Bao
93c2a01268 releasetools: Skip signing APKs with given prefixes.
We may pack prebuilts that end with ".apk" into target_files zip, via
PRODUCT_COPY_FILES. META/apkcerts.txt won't contain the cert info for
such files, and we want to keep them as is while signing, despite of the
".apk" extension.

This CL adds "--skip_apks_with_path_prefix" option to
sign_target_files_apks.py. APKs with matching prefixes will be copied
verbatim into the signed images. The prefix should match the entry names
in the target_files (e.g. "SYSTEM_OTHER/preloads/"). The option may be
repeated to specify multiple prefixes.

Note that although we may skip signing an APK file with "-e ApkName=".
This would skip *all* the APK files with the matching basename.
"--skip_apks_with_path_prefix" allows matching the exact prefix.

For example:
$ ./build/make/tools/releasetools/sign_target_files_apks.py     \
    --skip_apks_with_path_prefix SYSTEM_OTHER/preloads/         \
    --skip_apks_with_path_prefix PRODUCT/prebuilts/PrebuiltApp1 \
    --skip_apks_with_path_prefix VENDOR/app/PrebuiltApp2.apk    \
    target_files.zip                                            \
    signed-target_files.zip

Bug: 110201128
Test: Run the command above and check the logs.
Test: `python -m unittest test_sign_target_files_apks`
Change-Id: I7bd80b360917cef137cf1e7e8cfa796968831f47
2018-06-20 13:49:57 -07:00
Yifan Hong
2b6939e7e9 emulator sdk_phone_x86/_64: Add EmulatorSmokeTests
Fixes the build.

Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist \
   DIST_DIR=out/dist/git_master-without-vendor-linux-sdk_x86-sdk sdk_repo

Test: make -j110 PRODUCT-sdk_x86_64-sdk showcommands dist \
    DIST_DIR=out/dist/git_master-without-vendor-linux-sdk_x86_64-sdk sdk_repo

Change-Id: I67da40fc88b67cde0f8f959c13aa68dc0271da2a
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-20 13:33:00 -07:00
Makoto Onuki
d05d0b2fe1 Merge "Envsetup: Add way to skip installing completions" am: 0816dc15cc am: 83f8440aeb
am: c36c3da2dd

Change-Id: I72edab4eb099e6a883c993fb5adc30b037b087e9
2018-06-20 12:19:09 -07:00
Anton Hansson
80fc5e8c1c [automerger skipped] Merge "Delete core_tiny.mk" am: 8bc96c162c -s ours am: 763eedc66b -s ours
am: d13f7b4b92  -s ours

Change-Id: I2b9dae932ec11e87d17da0c8b3908f8dd482b87c
2018-06-20 12:17:23 -07:00
Anton Hansson
0edf4276af [automerger skipped] Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba am: ef2972781c -s ours am: a709e64b8e -s ours
am: f25a9912fe  -s ours

Change-Id: I5f119f2f819c236b56402198ba1680b356238faf
2018-06-20 12:11:37 -07:00
Makoto Onuki
c36c3da2dd Merge "Envsetup: Add way to skip installing completions" am: 0816dc15cc
am: 83f8440aeb

Change-Id: Ie936bd1aa7b0e90fd377fc4866883f4894e4a8c9
2018-06-20 12:08:41 -07:00
Anton Hansson
d13f7b4b92 [automerger skipped] Merge "Delete core_tiny.mk" am: 8bc96c162c -s ours
am: 763eedc66b  -s ours

Change-Id: Ic7ec9d28f42f101057f09ccb78d35dea0c155035
2018-06-20 12:07:55 -07:00