m7: split device tree into m7ul, m7att, m7spr, m7tmo
Conflicts:
slim.mk
vendorsetup.sh
diff --git a/slim.mk b/slim.mk
index 2e6c0f9..f3bb3c7 100644
--- a/slim.mk
+++ b/slim.mk
@@ -1,28 +1,12 @@
-$(call inherit-product, vendor/slim/config/common_full_phone.mk)
+$(call inherit-product, device/htc/m7spr/full_m7spr.mk)
$(call inherit-product, vendor/slim/config/cdma.mk)
-# Enhanced NFC
$(call inherit-product, vendor/slim/config/nfc_enhanced.mk)
-# Inherit device configuration
-$(call inherit-product, device/htc/m7wls/device_m7wls.mk)
+$(call inherit-product, vendor/slim/config/common_full_phone.mk)
-# Device naming
-PRODUCT_DEVICE := m7wls
-PRODUCT_NAME := slim_m7wls
-PRODUCT_BRAND := htc
-PRODUCT_MODEL := HTC One
-PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=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"
-# 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
-
-# Boot animation
-TARGET_SCREEN_HEIGHT := 1920
-TARGET_SCREEN_WIDTH := 1080
-
--include vendor/slim/config/common_versions.mk
+PRODUCT_NAME := slim_m7spr
+PRODUCT_DEVICE := m7spr