m7wls: inherit 8960 common, clean up.
Change-Id: I07df81bc84060bbb7130bbac9577fbeba66af375
diff --git a/cm.mk b/cm.mk
index b287a13..b787fd4 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,6 +1,23 @@
-## Specify phone tech before including full_phone
+$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+
$(call inherit-product, vendor/cm/config/cdma.mk)
+# Enhanced NFC
+$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/htc/m7wls/device_m7wls.mk)
+
+# Device naming
+PRODUCT_DEVICE := m7wls
+PRODUCT_NAME := cm_m7wls
+PRODUCT_BRAND := htc
+PRODUCT_MODEL := HTC One
+PRODUCT_MANUFACTURER := HTC
+
+# Set build fingerprint / ID / Product Name ect.
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_m7wls BUILD_ID=JZO54K BUILD_FINGERPRINT="htc/m7wls/m7wls:4.1.2/JZO54K/166937.7:user/release-keys" PRIVATE_BUILD_DESC="1.29.651.7 CL166937 release-keys"
+
# Release name
PRODUCT_RELEASE_NAME := m7wls
@@ -8,18 +25,4 @@
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1080
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m7wls/device_m7.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := m7wls
-PRODUCT_NAME := cm_m7wls
-PRODUCT_BRAND := htc
-PRODUCT_MODEL := HTC One
-PRODUCT_MANUFACTURER := HTC
+-include vendor/cm/config/common_versions.mk
\ No newline at end of file