odroidc4: Migrate to sm1-common tree

Change-Id: Iecca866b037e603241940dfb4687e33fb74ca732

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 041f6f3bf42e5611fc9d091c7004659c04962a79..6156769fe797ab140e262c308568e1636c3a2bbb 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,7 +20,7 @@ TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
 ## Include the common tree BoardConfig makefile
-include device/amlogic/g12-common/BoardConfigCommon.mk
+include device/amlogic/sm1-common/BoardConfigCommon.mk
 
 ## Include the proprietary BoardConfig makefile
 include vendor/amlogic/odroidc4/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index 37d97d76a64d2a785b6fab5b8a9121cf289f1b76..ffa47e9778843ab7f81d5ef09d8b60ae52d55094 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -21,7 +21,7 @@ TARGET_HAS_TEE := false
 BOARD_HAVE_WIFI := false
 
 ## Inherit from the common tree product makefile
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
+$(call inherit-product, device/amlogic/sm1-common/sm1.mk)
 
 ## Inherit from the proprietary files makefile
 $(call inherit-product, vendor/amlogic/odroidc4/odroidc4-vendor.mk)

diff --git a/extract-files.sh b/extract-files.sh
index cf62fdb29e86dfd2ac2ed5aa8b7520eebbff604c..5952f48bf75f61db29d17ea4d5b0f1eccb452737 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -15,7 +15,7 @@ fi
 set -e
 
 export DEVICE=odroidc4
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=amlogic
 export VENDOR_BRAND=hardkernel

diff --git a/lineage.dependencies b/lineage.dependencies
index 257b03666f27f5f9c345698192453ef11ceed25c..64468c208500e319eb24c9190ad5b22ca0f56e4d 100644 (file)
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,6 +1,6 @@
 [  
   {
-    "repository": "android_device_amlogic_g12-common",
-    "target_path": "device/amlogic/g12-common"
+    "repository": "android_device_amlogic_sm1-common",
+    "target_path": "device/amlogic/sm1-common"
   }
 ]

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index b0458ec2687a85007958c08820ebd0614a838046..72817c8167b85135915ee560318482bb734d2833 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -15,7 +15,7 @@ fi
 set -e
 
 export DEVICE=odroidc4
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=amlogic
 export VENDOR_BRAND=hardkernel