Commit Graph

46067 Commits

Author SHA1 Message Date
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
Kevin Rocard
dad3ad6126 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-06-19 17:48:10 -07:00
Bo Hu
c83dcc27d3 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp"" am: 6291a4a258 am: 31e612afb3
am: f43a1913d1

Change-Id: Iaa9dd5681c4dd2642e46874f976be570248f6367
2018-06-19 15:59:02 -07:00
Bo Hu
f43a1913d1 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp"" am: 6291a4a258
am: 31e612afb3

Change-Id: Icd738fe1d70fc659be57ebeaa5fb250748fec43a
2018-06-19 15:47:53 -07: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
Bo Hu
c82af2f6a9 Revert "emulator: base sdk_phone_armv7/64 on aosp"
This reverts commit b12abf0310.

Reason for revert: broke sdk build

Change-Id: Ib04df196806488245259f797eb9f52e61f337715
2018-06-19 22:19:47 +00:00
Tao Bao
11f955c506 releasetools: Factor out the check for (compressed) APK file.
Test: Run sign_target_files.py to sign a target_files.zip.
Test: `python -m unittest test_sign_target_files_apks`
Change-Id: Ie795d1bce7bae6af427832283e3d10bfecad80c5
2018-06-19 14:50:23 -07:00
Colin Cross
1c87e71e84 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
2018-06-19 14:20:44 -07:00
Bo Hu
74697993c0 [automerger skipped] Merge "emulator: base sdk_phone_armv7/64 on aosp" am: 5ce1e519ea am: 2ed87d0137 -s ours
am: df419cb1e4  -s ours

Change-Id: I74f67fd8313dab804126025ea7da742f0754b318
2018-06-19 14:16:12 -07:00
Kevin Chyn
36f11e4bbd Merge "Added android.hardware.biometrics.face to VNDK" 2018-06-19 20:55:55 +00:00
Dan Willemsen
028b782d5f Merge changes I101ced40,If9a4bed2 am: 949404a65b am: faad18291a
am: 0e32442652

Change-Id: Ieac06598f263279c202ede760b49c201f339f13a
2018-06-19 13:48:28 -07:00
Bo Hu
df419cb1e4 [automerger skipped] Merge "emulator: base sdk_phone_armv7/64 on aosp" am: 5ce1e519ea
am: 2ed87d0137  -s ours

Change-Id: Ib8ec466f8072508a95bb544d0061f33101f9ec34
2018-06-19 13:48:12 -07:00
Dan Willemsen
0e32442652 Merge changes I101ced40,If9a4bed2 am: 949404a65b
am: faad18291a

Change-Id: I7d13af4b0f6ee759398716b9fde557d5e39f5580
2018-06-19 13:45:10 -07:00
Bo Hu
2ed87d0137 Merge "emulator: base sdk_phone_armv7/64 on aosp"
am: 5ce1e519ea

Change-Id: I9284449872882da56972e8b740bd6043746f1984
2018-06-19 13:45:04 -07:00
Dan Willemsen
faad18291a Merge changes I101ced40,If9a4bed2
am: 949404a65b

Change-Id: I5f8f5a0b4921f54253d73d0c893a9f326ebded09
2018-06-19 13:42:23 -07:00
Vishwath Mohan
8575106e0e Merge "Add Scudo support for Make" am: ab0c76c869 am: 969a880b2f
am: 27a7c9369b

Change-Id: I8fcd15b795ef7b1e1d6be0b8501894603570b0be
2018-06-19 13:41:15 -07:00
Bo Hu
5ce1e519ea Merge "emulator: base sdk_phone_armv7/64 on aosp" 2018-06-19 20:39:26 +00:00
Dan Willemsen
949404a65b Merge changes I101ced40,If9a4bed2
* changes:
  Fix PHONY uses found by --warn_real_to_phony
  Fix vndk packaging to stop depending on phony targets
2018-06-19 20:35:57 +00:00
Colin Cross
84298f8fa5 Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master am: d7cf905f1f
am: 394665a08b

Change-Id: I3c97bb1a775ed25f5ae71165dba73155f99cb624
2018-06-19 13:32:21 -07:00
Vishwath Mohan
27a7c9369b Merge "Add Scudo support for Make" am: ab0c76c869
am: 969a880b2f

Change-Id: I38a0c1bda0277d4b20709659d87acc91f36ac4b5
2018-06-19 13:24:32 -07:00
Makoto Onuki
665a2a303a [automerger skipped] atest: switch from a shell function to binary am: cd20160644
am: 12a96ff4ed  -s ours

Change-Id: I1f0cad7ea43739592a0180a1ee631dd57c3cfc89
2018-06-19 13:16:55 -07:00
Colin Cross
394665a08b Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master
am: d7cf905f1f

Change-Id: Ia73f39726a30ef60868b036757bc3dc4c81614ed
2018-06-19 13:15:44 -07:00
Makoto Onuki
12a96ff4ed atest: switch from a shell function to binary
am: cd20160644

Change-Id: I0d8cefc286716578f318688bb8021ce9829f56d8
2018-06-19 13:13:49 -07:00
Vishwath Mohan
969a880b2f Merge "Add Scudo support for Make"
am: ab0c76c869

Change-Id: I722875707223675672a59c644f330cb94f2f6576
2018-06-19 13:12:40 -07:00
Android Build Merger (Role)
d7cf905f1f Merge "Merge "Revert "Revert "Inject minSdkVersion from the build system""" am: aac18a02d9" into stage-aosp-master 2018-06-19 20:11:16 +00:00
Colin Cross
4b96d34443 Merge "Revert "Revert "Inject minSdkVersion from the build system"""
am: aac18a02d9

Change-Id: I8ee10eb6a2fde98b34bb7d3fd74df4a88ab25892
2018-06-19 13:06:41 -07:00
Vishwath Mohan
ab0c76c869 Merge "Add Scudo support for Make" 2018-06-19 19:09:56 +00:00
bohu
b12abf0310 emulator: base sdk_phone_armv7/64 on aosp
Switch to GSI images for arm/arm64 sdk images.

BUG: 79941736

This cl does not impact real device images

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

Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Merged-In: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
2018-06-19 11:51:31 -07:00
Makoto Onuki
cd20160644 atest: switch from a shell function to binary
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
Merged-In: I868d24176538397a592d20a4d5082170b91c9ae4
2018-06-19 11:38:15 -07:00
Colin Cross
aac18a02d9 Merge "Revert "Revert "Inject minSdkVersion from the build system""" 2018-06-19 18:14:39 +00:00
Kostya Kortchinsky
2cfa99722b Add Scudo support for Make
Scudo is a hardened usermode allocator that is part of LLVM's compiler-rt
project (home of the Sanitizers). clang allows for -fsanitize=scudo as a
possible command line option to link the shared Scudo library to a binary.

This patch add Scudo as a potential sanitize option. Scudo is not compatible
with ASan and TSan and will be disabled if either is enabled.

Test: aosp compiled with m -j
Test: local experiment with LOCAL_SANITIZE := scudo to ensure that a test
target (mediaserver) could be linked with scudo.

Change-Id: I462843b9d5512fba2c4a3ac1a0c356ca90bce4e5
2018-06-19 09:46:35 -07:00
Dan Willemsen
14e1026372 Fix PHONY uses found by --warn_real_to_phony
Switch a use of `ndk` to the timestamp file that `ndk` depends on
itself.

Mark more module-specific rules as PHONY.

Test: diff build-aosp_arm.ninja (stripping _kati_always_build_)
Test: Turn on --warn_real_to_phony for Kati, see fewer warnings
Change-Id: I101ced4067780e38d18820f5d916596429087e49
2018-06-19 09:26:58 -07:00
Dan Willemsen
649311868c Fix vndk packaging to stop depending on phony targets
These had been depending on the phony target for the library
(liblz4.vendor), not the actual built file and notice file.

Since we hadn't been saving the NOTICE file, and were only assuming the
installed notice file path. save that away for use during packaging.

Test: m vndk; diff out/target/product/generic/android-vndk-aosp_arm.zip
Test: m vndk; diff out/target/product/generic_arm64/android-vndk-aosp_arm64.zip
Change-Id: If9a4bed27030b7bd464cd3987739df94d32a0037
2018-06-19 09:26:58 -07:00
Anton Hansson
dbe194f472 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:01:10 +00:00
Anton Hansson
552dcaf7d9 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:57:39 +01:00
Anton Hansson
e97125f5b7 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:29:34 +01:00
Anton Hansson
78b82bd8b6 [automerger skipped] Merge "Remove embedded.mk" am: f16031cfec -s ours am: 626237371a -s ours
am: f83be2750d  -s ours

Change-Id: Ieb7860d08f11ddafdc3aa041556e4cf8710a00ef
2018-06-19 05:56:02 -07:00
Anton Hansson
f83be2750d [automerger skipped] Merge "Remove embedded.mk" am: f16031cfec -s ours
am: 626237371a  -s ours

Change-Id: Ic2b0ade7f800dd08f98d85eba5294c7c34fa577a
2018-06-19 05:52:12 -07:00
Anton Hansson
626237371a [automerger skipped] Merge "Remove embedded.mk"
am: f16031cfec  -s ours

Change-Id: Ibad0249947d7868013f257ab727455cecf66228a
2018-06-19 05:49:02 -07:00
Anton Hansson
f16031cfec Merge "Remove embedded.mk" 2018-06-19 12:44:59 +00:00
Anton Hansson
d0288a12be [automerger skipped] Merge "Remove embedded.mk" into stage-aosp-master am: 631d0f8f3f -s ours
am: 3de14e64dc  -s ours

Change-Id: Ia0a051b1c5b55bab86b60576c2ddf3933624b31b
2018-06-19 03:47:08 -07:00
Anton Hansson
30db416826 [automerger skipped] Remove embedded.mk am: d88565085c -s ours
am: 00cec79600  -s ours

Change-Id: I304651ef4ac89e7a002cf96151de551c4be7b4c4
2018-06-19 03:45:56 -07:00
Anton Hansson
32e70da517 Remove embedded.mk
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:40:01 +00:00
Anton Hansson
50ae616915 resolve merge conflicts of bd9b116bfc to master
ag/4365985 got in the way

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:47:52 +01:00
Anton Hansson
3de14e64dc [automerger skipped] Merge "Remove embedded.mk" into stage-aosp-master
am: 631d0f8f3f  -s ours

Change-Id: Ibb471ae35d483beb388e515e31484b2ce513ab7d
2018-06-19 01:36:17 -07:00