summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-06-27 04:15:23 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-27 04:15:23 -0700
commit8766003b703f918ab7115a6771e87aeb6ff61a84 (patch)
treec0a9b0f69b5e8c49e3f5995dc67e9cfdcd029e15
parent9e96e041bf3c9d5b57b11f921c6339e076478a7a (diff)
parent133e4a7fac01e7f425e329c190eeb444b6278684 (diff)
downloaddevice_generic_armv7-a-neon-8766003b703f918ab7115a6771e87aeb6ff61a84.tar.gz
device_generic_armv7-a-neon-8766003b703f918ab7115a6771e87aeb6ff61a84.tar.bz2
device_generic_armv7-a-neon-8766003b703f918ab7115a6771e87aeb6ff61a84.zip
Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356 am: 98c1add8d0
am: 133e4a7fac Change-Id: I6b61791a4998a2177b8a7e0668f9c2b4a5672b75
-rw-r--r--mini_common.mk10
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)