j5: Convert to unified device tree
Change-Id: Ie00f8a17d572c6dd1a4bddd13a8fee9dabc0b392
diff --git a/Android.mk b/Android.mk
index 4a8ddc1..1ad3edb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter j5lte j5ltexx, $(TARGET_DEVICE)),)
+ifneq ($(filter j5lte, $(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 8c900eb..9f78079 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,3 +1,3 @@
-LOCAL_PATH := device/samsung/j5ltexx
+LOCAL_PATH := device/samsung/j5lte
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/omni_j5ltexx.mk
+ $(LOCAL_DIR)/omni_j5lte.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 652a79a..f261f3e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,10 +1,10 @@
# Inherit from common
include device/samsung/j5-common/BoardConfigCommon.mk
-LOCAL_PATH := device/samsung/j5ltexx
+LOCAL_PATH := device/samsung/j5lte
# Asserts
-TARGET_OTA_ASSERT_DEVICE := j5ltexx,j5lte
+TARGET_OTA_ASSERT_DEVICE := j5lte,j5ltexx
# Kernel
TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_j5lte_eur_defconfig
diff --git a/README.md b/README.md
index fa08344..ca07cb1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# android_device_samsung_j5ltexx
+# android_device_samsung_j5lte
## Device tree for Samsung Galaxy J5 LTE
diff --git a/device.mk b/device.mk
index e2fd975..523489b 100644
--- a/device.mk
+++ b/device.mk
@@ -1,10 +1,10 @@
#Inherit from vendor
-$(call inherit-product-if-exists, vendor/samsung/j5ltexx/j5ltexx-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/j5lte/j5lte-vendor.mk)
# Inherit from common
$(call inherit-product, device/samsung/j5-common/device-common.mk)
-LOCAL_PATH := device/samsung/j5ltexx
+LOCAL_PATH := device/samsung/j5lte
# System properties
-include $(LOCAL_PATH)/system_prop.mk
diff --git a/extract-files.sh b/extract-files.sh
index f45c9cc..feb20fa 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -19,7 +19,7 @@
set -e
# Required!
-export DEVICE=j5ltexx
+export DEVICE=j5lte
export DEVICE_COMMON=j5-common
export VENDOR=samsung
diff --git a/lineage.mk b/lineage.mk
index 3bd901d..09ee105 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -2,11 +2,11 @@
# Inherit from common
$(call inherit-product, device/samsung/j5-common/lineage.mk)
-$(call inherit-product, device/samsung/j5ltexx/device.mk)
+$(call inherit-product, device/samsung/j5lte/device.mk)
## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := j5ltexx
-PRODUCT_NAME := lineage_j5ltexx
+PRODUCT_DEVICE := j5lte
+PRODUCT_NAME := lineage_j5lte
PRODUCT_BRAND := samsung
PRODUCT_MODEL := SM-J500F
PRODUCT_MANUFACTURER := samsung
diff --git a/omni_j5ltexx.mk b/omni_j5lte.mk
similarity index 72%
rename from omni_j5ltexx.mk
rename to omni_j5lte.mk
index e61cbde..951deb6 100644
--- a/omni_j5ltexx.mk
+++ b/omni_j5lte.mk
@@ -2,11 +2,11 @@
# Inherit from common
$(call inherit-product, device/samsung/j5-common/omni.mk)
-$(call inherit-product, device/samsung/j5ltexx/device.mk)
+$(call inherit-product, device/samsung/j5lte/device.mk)
## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := j5ltexx
-PRODUCT_NAME := omni_j5ltexx
+PRODUCT_DEVICE := j5lte
+PRODUCT_NAME := omni_j5lte
PRODUCT_BRAND := samsung
PRODUCT_MODEL := SM-J500F
PRODUCT_MANUFACTURER := samsung
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 741e6ee..7156be7 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -19,7 +19,7 @@
set -e
# Required!
-export DEVICE=j5ltexx
+export DEVICE=j5lte
export DEVICE_COMMON=j5-common
export VENDOR=samsung
diff --git a/vendorsetup.sh b/vendorsetup.sh
index a8ec0eb..5fd03a5 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,3 @@
for i in eng userdebug user; do
- add_lunch_combo lineage_j5ltexx-${i}
+ add_lunch_combo lineage_j5lte-${i}
done