use full_base_telephony.mk as base

full_galaxys2.mk

@@ -22,8 +22,9 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+# This is where we'd set a backup provider if we had one
+#$(call inherit-product, device/sample/products/backup_overlay.mk)
 $(call inherit-product, device/samsung/galaxys2/galaxys2.mk)
 
 # Discard inherited values and use our own instead.

galaxys2.mk

@@ -43,31 +43,31 @@ PRODUCT_COPY_FILES += \
     device/samsung/galaxys2/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \
     device/samsung/galaxys2/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm
 
-#idc
+# Idc
 PRODUCT_COPY_FILES += \
     device/samsung/galaxys2/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \
     device/samsung/galaxys2/usr/idc/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc \
     device/samsung/galaxys2/usr/idc/qwerty.idc:system/usr/idc/qwerty.idc \
     device/samsung/galaxys2/usr/idc/qwerty2.idc:system/usr/idc/qwerty2.idc \
     device/samsung/galaxys2/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc
 
-# kernel modules for ramdisk
+# Kernel modules for ramdisk
 RAMDISK_MODULES := $(addprefix device/samsung/galaxys2/modules/,dhd.ko j4fs.ko \
 	scsi_wait_scan.ko Si4709_driver.ko)
 PRODUCT_COPY_FILES += $(foreach module,\
 	$(RAMDISK_MODULES),\
 	$(module):root/lib/modules/$(notdir $(module)))
 
-# other kernel modules not in ramdisk
+# Other kernel modules not in ramdisk
 PRODUCT_COPY_FILES += $(foreach module,\
 	$(filter-out $(RAMDISK_MODULES),$(wildcard device/samsung/galaxys2/modules/*.ko)),\
 	$(module):system/lib/modules/$(notdir $(module)))
 
-# kernel modules for recovery ramdisk
+# Kernel modules for recovery ramdisk
 PRODUCT_COPY_FILES += \
     device/samsung/galaxys2/modules/j4fs.ko:recovery/root/lib/modules/j4fs.ko
 
-# the kernel itself
+# The kernel itself
 PRODUCT_COPY_FILES += \
     device/samsung/galaxys2/zImage:kernel
 

galaxys2_base.mk

@@ -35,10 +35,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxys2/configs/vold.fstab:system/etc/vold.fstab \
 
-# Media
-PRODUCT_COPY_FILES += \
-	device/samsung/galaxys2/configs/media_profiles.xml:system/etc/media_profiles.xml
-
 # Bluetooth configuration files
 PRODUCT_COPY_FILES += \
 	system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf
@@ -73,11 +69,14 @@ PRODUCT_PACKAGES := \
 PRODUCT_PACKAGES += \
 	Camera
 
+PRODUCT_COPY_FILES += \
+	device/samsung/galaxys2/configs/media_profiles.xml:system/etc/media_profiles.xml
+
 # Sensors
 PRODUCT_PACKAGES += \
 	lights.exynos4
 
-# Ril
+# RIL
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.telephony.ril_class=Smdk4210RIL \
 	mobiledata.interfaces=pdp0,wlan0,gprs,ppp0
@@ -146,5 +145,5 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 $(call inherit-product, frameworks/base/build/phone-hdpi-512-dalvik-heap.mk)
 
 # Include exynos4 platform specific parts
-#$(call inherit-product, hardware/sec/exynos4/exynos4.mk)
-#$(call inherit-product, hardware/sec/exynos4/Android.mk)
+#$(call inherit-product, hardware/samsung/exynos4/exynos4.mk)
+#$(call inherit-product, hardware/samsung/exynos4/Android.mk)