cyanogen: Update to the new build layout.

inferiorhumanorgans · Mar 18, 2012 · 6b5767f · 6b5767f
1 parent 3bd5362
commit 6b5767f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
@@ -79,10 +79,9 @@ PRODUCT_MAKEFILES := \
 
 # Reassign this to prevent conflicts
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cyanogen_thunderc.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_cricket.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_metropcs.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_sprint.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_usc.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_verizon.mk \
-    $(LOCAL_DIR)/cyanogen_thunderc_VM670.mk
+    $(LOCAL_DIR)/cyanogen_thunderc_LS670.mk \
+    $(LOCAL_DIR)/cyanogen_thunderc_LW690.mk \
+    $(LOCAL_DIR)/cyanogen_thunderc_MS690.mk \
+    $(LOCAL_DIR)/cyanogen_thunderc_US670.mk \
+    $(LOCAL_DIR)/cyanogen_thunderc_VM670.mk \
+    $(LOCAL_DIR)/cyanogen_thunderc_VS660.mk
diff --git a/products/cyanogen_thunderc.mk b/products/cyanogen_thunderc.mk
@@ -4,8 +4,9 @@ PRODUCT_COPY_FILES := \
     vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip \
     $(PRODUCT_COPY_FILES)
 
-# Inherit device configuration for the thunderc.
-$(call inherit-product, device/lge/thunderc_common/thunderc.mk)
+# Inherit device configuration for the thunderc, which will in turn call the
+# necessary common code (device/lge/thunderc_common/thunderc_common.mk).
+$(call inherit-product, device/lge/thunderc_$(SUB_MODEL)/thunderc_$(SUB_MODEL).mk)
 
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)