Create m7univ device

This device tree will handle GSM, Sprint, and Verizon variants of m7
in TWRP.

Change-Id: Icddff30d3e120302c2f6cfc4d8a925363ce91972

Android.mk

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ifeq ($(RECOVERY_VARIANT), twrp)
-ifeq ($(TARGET_DEVICE), m7)
+ifeq ($(TARGET_DEVICE), m7univ)
 
 LOCAL_PATH := $(call my-dir)
 include $(call first-makefiles-under, $(LOCAL_PATH))

AndroidBoard.mk

@@ -5,4 +5,4 @@ include $(CLEAR_VARS)
 ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
 
 # include the non-open-source counterpart to this file
--include vendor/htc/m7/AndroidBoardVendor.mk
+-include vendor/htc/m7univ/AndroidBoardVendor.mk

BoardConfig.mk

@@ -17,7 +17,7 @@
 USE_CAMERA_STUB := true
 
 # inherit from the proprietary version
--include vendor/htc/m7/BoardConfigVendor.mk
+-include vendor/htc/m7univ/BoardConfigVendor.mk
 
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := m7
@@ -56,7 +56,7 @@ USE_OPENGL_RENDERER := true
 TARGET_DISPLAY_USE_RETIRE_FENCE := true
 TARGET_USES_C2D_COMPOSITION := true
 TARGET_USES_ION := true
-BOARD_EGL_CFG := device/htc/m7/configs/egl.cfg
+BOARD_EGL_CFG := device/htc/m7univ/configs/egl.cfg
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 
 # Power
@@ -82,7 +82,7 @@ BOARD_CHARGING_MODE_BOOTING_LPM := /sys/htc_lpm/lpm_mode
 # SELinux
 -include device/qcom/sepolicy/sepolicy.mk
 
-BOARD_SEPOLICY_DIRS += device/htc/m7/sepolicy
+BOARD_SEPOLICY_DIRS += device/htc/m7univ/sepolicy
 
 BOARD_SEPOLICY_UNION += \
     akmd.te \

Readme.md

@@ -1,9 +1,9 @@
-**TWRP - HTC One (GSM)**
+**TWRP - HTC One (Universal)**
 
-This is a recovery-only device tree for the HTC One (GSM) (m7att / m7tmo / m7ul).
+This is a recovery-only device tree for the HTC One (m7att / m7tmo / m7ul / m7wls / m7wlv).
 
 **Quick build instructions:**
 
     . build/envsetup.sh
-    lunch cm_m7-eng
+    lunch cm_m7univ-eng
     mka recoveryimage

cm.mk

@@ -1,18 +1,15 @@
 # Release name
-PRODUCT_RELEASE_NAME := m7
+PRODUCT_RELEASE_NAME := m7univ
 
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/htc/m7/device.mk)
+$(call inherit-product, device/htc/m7univ/device.mk)
 
 # Device identifier - this must come after all inclusions
-PRODUCT_DEVICE := m7
-PRODUCT_NAME := cm_m7
+PRODUCT_DEVICE := m7univ
+PRODUCT_NAME := cm_m7univ
 PRODUCT_BRAND := htc
 PRODUCT_MODEL := One
 PRODUCT_MANUFACTURER := HTC
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=m7_google

device.mk

@@ -3,11 +3,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 # The gps config appropriate for this device
 $(call inherit-product, device/common/gps/gps_us_supl.mk)
 
-$(call inherit-product-if-exists, vendor/htc/m7/m7-vendor.mk)
+$(call inherit-product-if-exists, vendor/htc/m7univ/m7univ-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/htc/m7/overlay
+DEVICE_PACKAGE_OVERLAYS += device/htc/m7univ/overlay
 
-LOCAL_PATH := device/htc/m7
+LOCAL_PATH := device/htc/m7univ
 ifeq ($(TARGET_PREBUILT_KERNEL),)
         LOCAL_KERNEL := $(LOCAL_PATH)/kernel
 else
@@ -17,5 +17,5 @@ endif
 $(call inherit-product, build/target/product/full.mk)
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-PRODUCT_NAME := full_m7
-PRODUCT_DEVICE := m7
+PRODUCT_NAME := full_m7univ
+PRODUCT_DEVICE := m7univ

system.prop

@@ -1,3 +1,3 @@
 #
-# system.prop for m7
+# system.prop for m7univ
 #