diff options
-rwxr-xr-x | BoardConfig.mk | 4 | ||||
-rw-r--r-- | configs/media_codecs.xml | 3 | ||||
-rw-r--r-- | du.mk | 38 | ||||
-rw-r--r-- | init/init_z2_plus.cpp | 2 |
4 files changed, 40 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 0e086b7..7bab4f9 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -171,10 +171,6 @@ BOARD_FLASH_BLOCK_SIZE := 262144 # QCOM Power TARGET_POWERHAL_VARIANT := qcom -# RIL -TARGET_RIL_VARIANT := caf -SIM_COUNT := 2 - # Recovery TARGET_RECOVERY_FSTAB := $(PLATFORM_PATH)/rootdir/fstab.qcom TARGET_RECOVERY_UI_LIB := librecovery_ui_msm diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index 0467e84..3657916 100644 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -408,5 +408,4 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" /> </Decoders> <Include href="media_codecs_google_video.xml" /> - <Include href="media_codecs_ffmpeg.xml" /> -</MediaCodecs>
\ No newline at end of file +</MediaCodecs> @@ -0,0 +1,38 @@ +# 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 DU stuff. +$(call inherit-product, vendor/du/config/common_full_phone.mk) + +PRODUCT_NAME := du_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 diff --git a/init/init_z2_plus.cpp b/init/init_z2_plus.cpp index d6733c3..78740f6 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.cm.device", device, NULL); + rc = property_get("ro.du.device", device, NULL); if (!rc || strncmp(device, "z2_plus", PROP_VALUE_MAX)) return; |