Commit graph

45154 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
83f8440aeb Merge "Envsetup: Add way to skip installing completions"
am: 0816dc15cc

Change-Id: I32eda2057ff8714e5290aa6186c0425dc83c2683
2018-06-20 11:58:00 -07:00
Anton Hansson
763eedc66b [automerger skipped] Merge "Delete core_tiny.mk"
am: 8bc96c162c  -s ours

Change-Id: Id1da54536bf969ee0af656aaa4e2896c3f1c4031
2018-06-20 11:57:25 -07:00
Anton Hansson
a709e64b8e [automerger skipped] Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba
am: ef2972781c  -s ours

Change-Id: I6140a355a49a73652c5bfa086e230f128ade52e5
2018-06-20 11:55:31 -07:00
Anton Hansson
9c96dcaa87 Merge "Remove core.mk." into stage-aosp-master 2018-06-20 17:40:44 +00:00
Makoto Onuki
0816dc15cc Merge "Envsetup: Add way to skip installing completions" 2018-06-20 17:32:50 +00:00
Anton Hansson
e9d34eccf3 Merge "Remove sdk_base.mk." into stage-aosp-master 2018-06-20 17:27:29 +00:00
Anton Hansson
8bc96c162c Merge "Delete core_tiny.mk" 2018-06-20 17:15:53 +00: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
Tom Cherry
cd7535c00d Merge "Verify init scripts for correctness during build"
am: 8075746865

Change-Id: I96b7f88a3e568e147c3e3f68709e4c7eb3b525c6
2018-06-20 10:09:01 -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

Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00
Dan Willemsen
4f38769dd0 Merge "Fix UML build"
am: d7c3dd8a0d

Change-Id: I0bc90244c42a00a96c0d0ea208225771d28f4bfa
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
023b5104d7 Merge "releasetools: Factor out the check for (compressed) APK file."
am: 2ba547a1c7

Change-Id: I0ae458b3c0d8c0335c8175138185ce714d065471
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
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
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
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
56be041198 Merge "Export SDK library names"
am: dabf1a0c5a

Change-Id: Iad2365d9bb02de297dd06cd2bc36c288a043dfc2
2018-06-20 01:14:56 -07:00
Bo Hu
c2c164504d Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
am: 9379de6756

Change-Id: Ibe57c92bbccbc8f8b9bdf87f87cca32880a3073c
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
Dan Willemsen
406418d055 Fix UML build
If there aren't any boot dex files, we can't generate a boot image
profile.

Test: lunch uml-eng; m
Test: diff build-aosp_arm.ninja
Change-Id: I09cc1ef37379d9d353958c8aa75731f3d29df759
2018-06-19 23:03:34 -07:00
Treehugger Robot
dabf1a0c5a Merge "Export SDK library names" 2018-06-20 05:40:09 +00:00
Bo Hu
9379de6756 Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""" 2018-06-20 05:04:22 +00:00
bohu
19481ce902 Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""
This reverts commit c82af2f6a9.

Change-Id: I62ce24e5b58b15b0c9026ebfea23860ec2f9bfae
2018-06-19 21:32:05 -07:00
Jiyong Park
1cf8ee619b Export SDK library names
A java module exports SDK library names that it is using directly or
indirectly via its dependencies. Manifest fixer uses the SDK lib names
to automatically add <uses-library> tags for the apk.

The SDK library names are exported via exported-sdk-libs file in make.
From Soong, they are exported via LOCAL_EXPORT_SDK_LIBRARIES flag.

Bug: 77575606
Test: m -j

Change-Id: I4e7a9bdc5bf845af85168abf55f8063900bacc72
2018-06-20 11:50:06 +09:00
Bo Hu
31e612afb3 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp""
am: 6291a4a258

Change-Id: I9f78612d267d8663489d17524aebedffc0ec7c71
2018-06-19 15:41:39 -07:00
Bo Hu
6291a4a258 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp"" 2018-06-19 22:25:31 +00:00