From 60e95f3e1aba6e3c22f73bd1df1a3e6696a1a415 Mon Sep 17 00:00:00 2001 From: TheStrix Date: Sat, 1 Jun 2019 12:57:07 +0530 Subject: [PATCH] products: Add OnePlus 6/6T Change-Id: Iacdc399810f24a7557ae014cf81c227234fecad3 --- products/AndroidProducts.mk | 4 ++- products/oneplus6/pa.dependencies | 56 ++++++++++++++++++++++++++++++ products/oneplus6/pa_oneplus6.mk | 53 ++++++++++++++++++++++++++++ products/oneplus6t/pa.dependencies | 56 ++++++++++++++++++++++++++++++ products/oneplus6t/pa_oneplus6t.mk | 53 ++++++++++++++++++++++++++++ vendorsetup.sh | 2 ++ 6 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 products/oneplus6/pa.dependencies create mode 100644 products/oneplus6/pa_oneplus6.mk create mode 100644 products/oneplus6t/pa.dependencies create mode 100644 products/oneplus6t/pa_oneplus6t.mk diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index 655333a0..782e0d2f 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2017 Paranoid Android +# Copyright (C) 2016-2019 Paranoid Android # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,6 +19,8 @@ $(LOCAL_DIR)/dipper/pa_dipper.mk \ $(LOCAL_DIR)/gemini/pa_gemini.mk \ $(LOCAL_DIR)/oneplus3/pa_oneplus3.mk \ + $(LOCAL_DIR)/oneplus6/pa_oneplus6.mk \ + $(LOCAL_DIR)/oneplus6t/pa_oneplus6t.mk \ $(LOCAL_DIR)/polaris/pa_polaris.mk \ $(LOCAL_DIR)/sagit/pa_sagit.mk \ diff --git a/products/oneplus6/pa.dependencies b/products/oneplus6/pa.dependencies new file mode 100644 index 00000000..c9aa9ddd --- /dev/null +++ b/products/oneplus6/pa.dependencies @@ -0,0 +1,56 @@ +[ + { + "remote": "aospa", + "repository": "AOSPA/android_device_oneplus_oneplus6", + "target_path": "device/oneplus/oneplus6", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_device_oneplus_sdm845-common", + "target_path": "device/oneplus/sdm845-common", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_kernel_oneplus_sdm845", + "target_path": "kernel/oneplus/sdm845", + "revision": "pie" + }, + { + "remote": "blobs", + "repository": "proprietary_vendor_oneplus", + "target_path": "vendor/oneplus", + "revision": "pie" + }, + { + "remote": "blobs", + "repository": "proprietary_vendor_qcom_common", + "target_path": "vendor/qcom/common", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_audio", + "target_path": "hardware/qcom/audio", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_display", + "target_path": "hardware/qcom/display", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_media", + "target_path": "hardware/qcom/media", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_vendor_qcom_opensource_commonsys-intf_display", + "target_path": "vendor/qcom/opensource/commonsys-intf/display", + "revision": "pie" + } +] diff --git a/products/oneplus6/pa_oneplus6.mk b/products/oneplus6/pa_oneplus6.mk new file mode 100644 index 00000000..cffdfb3a --- /dev/null +++ b/products/oneplus6/pa_oneplus6.mk @@ -0,0 +1,53 @@ +# Copyright (C) 2019 Paranoid Android +# +# 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. + +# Check for target product +ifeq (pa_oneplus6,$(TARGET_PRODUCT)) + +# 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/aosp_base_telephony.mk) + +# Include Paranoid Android common configuration +TARGET_BOOT_ANIMATION_RES := 1080 + +TARGET_USES_AOSP := false +TARGET_USES_QCOM_BSP := false + +include device/qcom/common/common.mk +include vendor/pa/main.mk + +# Inherit AOSP device configuration +$(call inherit-product, device/oneplus/oneplus6/device.mk) + +# Override AOSP build properties +PRODUCT_NAME := pa_oneplus6 +PRODUCT_DEVICE := oneplus6 +PRODUCT_BRAND := OnePlus +PRODUCT_MODEL := OnePlus 6 +PRODUCT_MANUFACTURER := OnePlus + +PRODUCT_GMS_CLIENTID_BASE := android-oneplus + +TARGET_VENDOR_PRODUCT_NAME := OnePlus6 +TARGET_VENDOR_DEVICE_NAME := OnePlus6 + +PRODUCT_BUILD_PROP_OVERRIDES += \ + TARGET_DEVICE=OnePlus6 \ + PRODUCT_NAME=OnePlus6 \ + PRIVATE_BUILD_DESC="OnePlus6-user 8.1.0 OPM1.171019.011 273 release-keys" + +BUILD_FINGERPRINT := OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys + +endif diff --git a/products/oneplus6t/pa.dependencies b/products/oneplus6t/pa.dependencies new file mode 100644 index 00000000..db0ccccb --- /dev/null +++ b/products/oneplus6t/pa.dependencies @@ -0,0 +1,56 @@ +[ + { + "remote": "aospa", + "repository": "AOSPA/android_device_oneplus_oneplus6t", + "target_path": "device/oneplus/oneplus6t", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_device_oneplus_sdm845-common", + "target_path": "device/oneplus/sdm845-common", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_kernel_oneplus_sdm845", + "target_path": "kernel/oneplus/sdm845", + "revision": "pie" + }, + { + "remote": "blobs", + "repository": "proprietary_vendor_oneplus", + "target_path": "vendor/oneplus", + "revision": "pie" + }, + { + "remote": "blobs", + "repository": "proprietary_vendor_qcom_common", + "target_path": "vendor/qcom/common", + "revision": "pie" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_audio", + "target_path": "hardware/qcom/audio", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_display", + "target_path": "hardware/qcom/display", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_hardware_qcom_media", + "target_path": "hardware/qcom/media", + "revision": "pie-845" + }, + { + "remote": "aospa", + "repository": "AOSPA/android_vendor_qcom_opensource_commonsys-intf_display", + "target_path": "vendor/qcom/opensource/commonsys-intf/display", + "revision": "pie" + } +] diff --git a/products/oneplus6t/pa_oneplus6t.mk b/products/oneplus6t/pa_oneplus6t.mk new file mode 100644 index 00000000..d7e8311a --- /dev/null +++ b/products/oneplus6t/pa_oneplus6t.mk @@ -0,0 +1,53 @@ +# Copyright (C) 2019 Paranoid Android +# +# 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. + +# Check for target product +ifeq (pa_oneplus6t,$(TARGET_PRODUCT)) + +# 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/aosp_base_telephony.mk) + +# Include Paranoid Android common configuration +TARGET_BOOT_ANIMATION_RES := 1080 + +TARGET_USES_AOSP := false +TARGET_USES_QCOM_BSP := false + +include device/qcom/common/common.mk +include vendor/pa/main.mk + +# Inherit AOSP device configuration +$(call inherit-product, device/oneplus/oneplus6t/device.mk) + +# Override AOSP build properties +PRODUCT_NAME := pa_oneplus6t +PRODUCT_DEVICE := oneplus6t +PRODUCT_BRAND := OnePlus +PRODUCT_MODEL := OnePlus 6T +PRODUCT_MANUFACTURER := OnePlus + +PRODUCT_GMS_CLIENTID_BASE := android-oneplus + +TARGET_VENDOR_PRODUCT_NAME := OnePlus6T +TARGET_VENDOR_DEVICE_NAME := OnePlus6T + +PRODUCT_BUILD_PROP_OVERRIDES += \ + TARGET_DEVICE=OnePlus6T \ + PRODUCT_NAME=OnePlus6T \ + PRIVATE_BUILD_DESC="OnePlus6T-user 9 PKQ1.180716.001 1812260627 release-keys" + +BUILD_FINGERPRINT := OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1812260627:user/release-keys + +endif diff --git a/vendorsetup.sh b/vendorsetup.sh index 7232d2d2..2cc43a00 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -3,6 +3,8 @@ add_lunch_combo pa_beryllium-userdebug add_lunch_combo pa_dipper-userdebug add_lunch_combo pa_gemini-userdebug add_lunch_combo pa_oneplus3-userdebug +add_lunch_combo pa_oneplus6-userdebug +add_lunch_combo pa_oneplus6t-userdebug add_lunch_combo pa_polaris-userdebug add_lunch_combo pa_sagit-userdebug