m5: Migrate to sm1-common tree

Change-Id: Iecca866b037e603241940dfb4687e33fb74ca732

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f88805629ee08b602dce284be75c750bc98f18a5..6b9275905b295c7ad99b91c3537564c297998737 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,7 +30,7 @@ WIFI_DRIVER_SOCKET_IFACE := wlan0
 PRODUCT_CFI_INCLUDE_PATHS += hardware/realtek/wlan/wpa_supplicant_8_lib
 
 ## 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/m5/BoardConfigVendor.mk

diff --git a/device.mk b/device.mk
index 9129efb4f537ac0fad3ee0a9d76ebcbec10ee832..5b7c09d2470711668be152ec4a31fc82d21acf8b 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -32,7 +32,7 @@ TARGET_AMLOGIC_SOC := sm1
 TARGET_HAS_TEE := 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/m5/m5-vendor.mk)

diff --git a/extract-files.sh b/extract-files.sh
index cee1350840a4db6042742ee8fd7698771531ade4..14946e834c9569bf72d04bda9b3a6a9f75ad8af0 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -15,7 +15,7 @@ fi
 set -e
 
 export DEVICE=m5
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=amlogic
 export VENDOR_BRAND=bananapi

diff --git a/lineage.dependencies b/lineage.dependencies
index 09b7928d135e0f6463b8b662397fed3a3311bff1..266328a77f1516a78d4bd78eae3a3f64b883488e 100644 (file)
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,7 +1,7 @@
 [  
   {
-    "repository": "android_device_amlogic_g12-common",
-    "target_path": "device/amlogic/g12-common"
+    "repository": "android_device_amlogic_sm1-common",
+    "target_path": "device/amlogic/sm1-common"
   },
   {
     "repository": "android_hardware_amlogic_kernel-modules_rtk_btusb",

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 5ef3c769d6d48ad6c5086bdba7a2a91041b72f2e..f3835eba4f8b79434d68f6ef9cc8b06430f31399 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -15,7 +15,7 @@ fi
 set -e
 
 export DEVICE=m5
-export DEVICE_COMMON=g12-common
+export DEVICE_COMMON=sm1-common
 export TARGET_SOC=sm1
 export VENDOR=amlogic
 export VENDOR_BRAND=bananapi