aex-ify

6 files changed, 66 insertions, 4 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..32be961
--- /dev/null
+++ b/AndroidProducts.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/aosp_z2_plus.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 16091af..47f1433 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -64,7 +64,7 @@ ENABLE_SCHED_BOOST := true
 TARGET_USES_64_BIT_BINDER := true
 
 # Kernel
-BOARD_KERNEL_CMDLINE := console=tty60,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=16M@0-0xffffffff
+BOARD_KERNEL_CMDLINE := console=tty60,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=16M@0-0xffffffff androidboot.selinux=permissive
 BOARD_KERNEL_BASE := 0x80000000
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
diff --git a/aosp_z2_plus.mk b/aosp_z2_plus.mk
new file mode 100644
index 0000000..08c9916
--- /dev/null
+++ b/aosp_z2_plus.mk
@@ -0,0 +1,43 @@
+# Copyright (C) 2013-2016, The CyanogenMod Project
+# Copyright (C) 2017, The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+# Inherit from z2_plus device
+$(call inherit-product, device/zuk/z2_plus/device.mk)
+
+# Inherit some common AOSP-OMS stuff.
+$(call inherit-product, vendor/aosp/common.mk)
+
+PRODUCT_NAME := aosp_z2_plus
+PRODUCT_DEVICE := z2_plus
+PRODUCT_MANUFACTURER := ZUK
+PRODUCT_BRAND := ZUK
+PRODUCT_MODEL := Z2 Plus
+
+PRODUCT_GMS_CLIENTID_BASE := android-zuk
+
+TARGET_VENDOR_PRODUCT_NAME := z2_plus
+TARGET_VENDOR_DEVICE_NAME := z2_plus
+PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=z2_plus PRODUCT_NAME=z2_plus
+
+TARGET_VENDOR := zuk
+
+# Fingerprint
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BUILD_FINGERPRINT="ZUK/z2_plus/z2_plus:6.0.1/MMB29M/1.9.077_160617:user/release-keys" \
+    PRIVATE_BUILD_DESC="z2_plus-user 6.0.1 MMB29M 1.9.077_160617 release-keys"
diff --git a/device.mk b/device.mk
index 40d8b7f..ce242ea 100755
--- a/device.mk
+++ b/device.mk
@@ -131,8 +131,8 @@ PRODUCT_PACKAGES += \
     libtinyxml
 
 # Doze mode
-PRODUCT_PACKAGES += \
-    ZukDoze
+# PRODUCT_PACKAGES += \
+#     ZukDoze
 
 # Fingerprint
 PRODUCT_PACKAGES += \
diff --git a/init/init_z2_plus.cpp b/init/init_z2_plus.cpp
index 78740f6..fd30f51 100644
--- a/init/init_z2_plus.cpp
+++ b/init/init_z2_plus.cpp
@@ -72,7 +72,7 @@ void vendor_load_properties() {
     char rf_version[PROP_VALUE_MAX];
     int rc;
 
-    rc = property_get("ro.du.device", device, NULL);
+    rc = property_get("ro.product.device", device, NULL);
     if (!rc || strncmp(device, "z2_plus", PROP_VALUE_MAX))
         return;
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100755
index 0000000..d1a0d83
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,2 @@
+add_lunch_combo aosp_z2_plus-userdebug
+add_lunch_combo aosp_z2_plus-eng