jfltexx: update props, deps, blobs, de-unify

Change-Id: I69da06228643d8154400bb25489870e7a5b59279

BoardConfig.mk

@@ -20,14 +20,11 @@
 # 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/jfltexx/BoardConfigVendor.mk
+-include vendor/samsung/jf-gsm-common/BoardConfigVendor.mk
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := jflte,jfltexx,i9505,GT-I9505,jgedlte,i9505g,GT-I9505G
-
-# Kernel
-TARGET_KERNEL_CONFIG         := jf_eur_defconfig
+TARGET_OTA_ASSERT_DEVICE := jfltexx,i9505,GT-I9505,jgedlte,i9505g,GT-I9505G,jflte

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"
   }
 ]

cm.mk

@@ -6,7 +6,11 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jfltexx TARGET_DEVICE=jfltexx BUILD_FINGERPRINT="samsung/jfltexx/jflte:4.2.2/JDQ39/I9505XXUAMDE:user/release-keys" PRIVATE_BUILD_DESC="jfltexx-user 4.2.2 JDQ39 I9505XXUAMDE release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += \
+  PRODUCT_NAME=jfltexx \
+  TARGET_DEVICE=jfltexx \
+  BUILD_FINGERPRINT="samsung/jfltexx/jflte:4.2.2/JDQ39/I9505XXUAMDE:user/release-keys" \
+  PRIVATE_BUILD_DESC="jfltexx-user 4.2.2 JDQ39 I9505XXUAMDE release-keys"
 
 PRODUCT_DEVICE := jfltexx
 PRODUCT_NAME := cm_jfltexx

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

device.mk

@@ -15,10 +15,10 @@
 #
 
 ## (2) Also get non-open-source specific aspects if available
-$(call inherit-product-if-exists, vendor/samsung/jfltexx/jfltexx-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/jf-gsm-common/jf-gsm-common-vendor.mk)
 
-## common overlays
-DEVICE_PACKAGE_OVERLAYS += device/samsung/jf-common/overlay-gsm
+## device overlays
+DEVICE_PACKAGE_OVERLAYS += device/samsung/jfltexx/overlay
 
 # Inherit from jf-common
 $(call inherit-product, device/samsung/jf-common/jf-common.mk)

full_jfltexx.mk

@@ -20,11 +20,11 @@
 # 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
+
+# Inherit from jfltexx device
 $(call inherit-product, device/samsung/jfltexx/device.mk)
 
 # Set those variables here to overwrite the inherited values.

system.prop

@@ -3,7 +3,6 @@
 
 # cannot take spaces
 rild.libargs=-d /dev/smd0
-
-
+rild.libpath=/system/lib/libsec-ril.so
 telephony.lteOnGsmDevice=1
 ro.telephony.default_network=9