diff options
| author | Anton Hansson <hansson@google.com> | 2018-06-27 10:05:08 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-06-27 10:05:38 +0100 |
| commit | bfb81f53d2cf49a65d43c9b8140c2ae0afe32840 (patch) | |
| tree | c0a9b0f69b5e8c49e3f5995dc67e9cfdcd029e15 | |
| parent | 9e96e041bf3c9d5b57b11f921c6339e076478a7a (diff) | |
| download | armv7-a-neon-bfb81f53d2cf49a65d43c9b8140c2ae0afe32840.tar.gz | |
Inline contents of core_base.mk in mini_common.mk
core_base.mk is being deleted, so inline its contents in its children.
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I5966251e20c0accd557abc319dea47c71e61cf9a
| -rw-r--r-- | mini_common.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mini_common.mk b/mini_common.mk index 9731c7e..9e93531 100644 --- a/mini_common.mk +++ b/mini_common.mk @@ -26,6 +26,7 @@ PRODUCT_LOCALES := en_US PRODUCT_PACKAGES += \ Bluetooth \ FusedLocation \ + Home \ InputDevices \ Keyguard \ LatinIME \ @@ -34,8 +35,10 @@ PRODUCT_PACKAGES += \ Provision \ Settings \ SystemUI \ + TelephonyProvider \ TeleService \ TestingCamera \ + UserDictionaryProvider \ WAPPushManager \ audio \ audio.primary.default \ @@ -56,7 +59,7 @@ PRODUCT_PACKAGES += \ power.default \ sdptool \ vibrator.default \ - wpa_supplicant.conf + wpa_supplicant.conf \ # This is not necessary for mini, but is for mini-emulator as it should # be included in platform.zip @@ -73,10 +76,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.carrier=unknown \ + ro.config.alarm_alert=Alarm_Classic.ogg \ ro.config.ringtone=Ring_Synth_04.ogg \ - ro.config.notification_sound=pixiedust.ogg + ro.config.notification_sound=pixiedust.ogg \ -$(call inherit-product, build/target/product/core_base.mk) +$(call inherit-product, build/target/product/core_minimal.mk) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) |