Merge "Remove core_base.mk"

am: cc496f9b61

Change-Id: I55e203de13b9ed6bdc18b73a9a77f898f34bb1b8

target/product/core_base.mk

@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-PRODUCT_PROPERTY_OVERRIDES := \
-    ro.config.notification_sound=OnTheHunt.ogg \
-    ro.config.alarm_alert=Alarm_Classic.ogg
-
-PRODUCT_PACKAGES += \
-    Home \
-    TelephonyProvider \
-    UserDictionaryProvider \
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)

target/product/generic_no_telephony.mk

@@ -46,6 +46,7 @@ PRODUCT_PACKAGES := \
     ExternalStorageProvider \
     FusedLocation \
     Gallery2 \
+    Home \
     InputDevices \
     KeyChain \
     Keyguard \
@@ -82,9 +83,11 @@ PRODUCT_PACKAGES := \
     SystemUI \
     SysuiDarkThemeOverlay \
     Telecom \
+    TelephonyProvider \
     TeleService \
     Traceur \
     vibrator.default \
+    UserDictionaryProvider \
     VpnDialogs \
     vr \
     WallpaperCropper \
@@ -100,7 +103,9 @@ PRODUCT_COPY_FILES := \
         frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.carrier=unknown
+    ro.carrier=unknown \
+    ro.config.notification_sound=OnTheHunt.ogg \
+    ro.config.alarm_alert=Alarm_Classic.ogg
 
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 $(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
@@ -112,7 +117,7 @@ $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
 $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 
 # Overrides
 PRODUCT_BRAND := generic