diff options
| author | Anton Hansson <hansson@google.com> | 2018-06-27 04:06:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-27 04:06:50 -0700 |
| commit | 98c1add8d047381bc8d325d0069170600d2b3388 (patch) | |
| tree | c0a9b0f69b5e8c49e3f5995dc67e9cfdcd029e15 | |
| parent | 9e96e041bf3c9d5b57b11f921c6339e076478a7a (diff) | |
| parent | ee034bd356af1dfcf66265b1fe9f59ac6a81a2bc (diff) | |
| download | armv7-a-neon-master-cuttlefish-testing-release.tar.gz | |
Merge "Inline contents of core_base.mk in mini_common.mk"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
am: ee034bd356
Change-Id: Ia7ddb4a102609444fb839df5b53022cfb9bcb4a2
| -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) |