From 75daa57e44dc35843b7cb28f34308726411aff45 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Wed, 9 Oct 2024 17:57:17 -0400 Subject: [PATCH] odroidc4: Migrate to sm1-common tree Change-Id: Iecca866b037e603241940dfb4687e33fb74ca732 --- BoardConfig.mk | 2 +- device.mk | 2 +- extract-files.sh | 2 +- lineage.dependencies | 4 ++-- setup-makefiles.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 041f6f3..6156769 100644 --- 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 37d97d7..ffa47e9 100644 --- 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 cf62fdb..5952f48 100755 --- 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 257b036..64468c2 100644 --- 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 b0458ec..72817c8 100755 --- 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 -- 2.20.1