diff options
author | Anton Hansson <hansson@google.com> | 2018-06-27 04:11:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-27 04:11:22 -0700 |
commit | 133e4a7fac01e7f425e329c190eeb444b6278684 (patch) | |
tree | c0a9b0f69b5e8c49e3f5995dc67e9cfdcd029e15 | |
parent | 9e96e041bf3c9d5b57b11f921c6339e076478a7a (diff) | |
parent | 98c1add8d047381bc8d325d0069170600d2b3388 (diff) | |
download | armv7-a-neon-nougat-iot-release.tar.gz |
Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-release
am: 98c1add8d0
Change-Id: I7f33e9934066f2babd08a67667b3f70742c13401
-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) |