jfltetmo: update props, deps, blobs, de-unify
Change-Id: If1194598e55972d6f5bc6c006cd05e648998709e
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7ed4fe6..60e9681 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,14 +20,12 @@
# definition file).
#
-# inherit from common JF
--include device/samsung/jf-common/BoardConfigCommon.mk
+# inherit from common jf
+include device/samsung/jf-common/BoardConfigCommon.mk
# inherit from the proprietary version
-include vendor/samsung/jfltetmo/BoardConfigVendor.mk
# Assert
-TARGET_OTA_ASSERT_DEVICE := jfltetmo
+TARGET_OTA_ASSERT_DEVICE := jfltetmo,jflte
-# Kernel
-TARGET_KERNEL_CONFIG := jf_tmo_defconfig
diff --git a/cm.dependencies b/cm.dependencies
index b409230..b8453ec 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -1,22 +1,6 @@
[
{
- "repository": "android_device_samsung_qcom-common",
- "target_path": "device/samsung/qcom-common"
- },
- {
- "repository": "android_device_samsung_msm8960-common",
- "target_path": "device/samsung/msm8960-common"
- },
- {
"repository": "android_device_samsung_jf-common",
"target_path": "device/samsung/jf-common"
- },
- {
- "repository": "android_kernel_samsung_jf",
- "target_path": "kernel/samsung/jf"
- },
- {
- "repository": "android_hardware_samsung",
- "target_path": "hardware/samsung"
}
]
diff --git a/cm.mk b/cm.mk
index 6bffcb4..c4de88b 100644
--- a/cm.mk
+++ b/cm.mk
@@ -6,7 +6,11 @@
# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jfltetmo TARGET_DEVICE=jfltetmo BUILD_FINGERPRINT="samsung/jfltetmo/jfltetmo:4.3/JSS15J/M919UVUEMK2:user/release-keys" PRIVATE_BUILD_DESC="jfltetmo-user 4.3 JSS15J M919UVUEMK2 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ PRODUCT_NAME=jfltetmo \
+ TARGET_DEVICE=jfltetmo \
+ BUILD_FINGERPRINT="samsung/jfltetmo/jfltetmo:4.4.4/KTU84P/M919UVUFNH7:user/release-keys" \
+ PRIVATE_BUILD_DESC="jfltetmo-user 4.4.4 KTU84P M919UVUFNH7 release-keys"
PRODUCT_NAME := cm_jfltetmo
PRODUCT_DEVICE := jfltetmo
diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt
index 755c891..e38bad1 100644
--- a/device-proprietary-files.txt
+++ b/device-proprietary-files.txt
@@ -1 +1,13 @@
# Add device specific blobs here
+
+# Camera
+lib/libvdis.so
+cameradata/M10MO_SFW.bin
+cameradata/RS_M10MO_OL.bin
+cameradata/RS_M10MO_OS.bin
+cameradata/RS_M10MO_SL.bin
+cameradata/RS_M10MO_SS.bin
+
+# Radio
+lib/libsec-ril.so
+lib/libril.so
\ No newline at end of file
diff --git a/device.mk b/device.mk
index 606bfe5..7580abd 100644
--- a/device.mk
+++ b/device.mk
@@ -19,8 +19,6 @@
## device overlays
DEVICE_PACKAGE_OVERLAYS += device/samsung/jfltetmo/overlay
-## common overlays
-DEVICE_PACKAGE_OVERLAYS += device/samsung/jf-common/overlay-gsm
# Inherit from jf-common
$(call inherit-product, device/samsung/jf-common/jf-common.mk)
diff --git a/full_jfltetmo.mk b/full_jfltetmo.mk
index 8ae16f6..213aa9b 100644
--- a/full_jfltetmo.mk
+++ b/full_jfltetmo.mk
@@ -20,10 +20,10 @@
# details, it only fundamentally contains two inherit-product
# lines, full and maguro, hence its name.
#
-
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
# Inherit from jfltetmo device
$(call inherit-product, device/samsung/jfltetmo/device.mk)
diff --git a/overlay/packages/providers/TelephonyProvider/res/values/config.xml b/overlay/packages/providers/TelephonyProvider/res/values/config.xml
deleted file mode 100644
index 1e4d855..0000000
--- a/overlay/packages/providers/TelephonyProvider/res/values/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The CyanogenMod 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.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <!-- The preferred APN to use, in the format name,mcc,mnc
- Leave empty to choose automatically. -->
- <string name="config_preferred_apn">fast.t-mobile.com,310,260</string>
-</resources>
-