From ab03f382de0277abf09ccd4d786d10516018200a Mon Sep 17 00:00:00 2001 From: Timo Dorfner Date: Sun, 6 Oct 2024 21:28:46 +0200 Subject: [PATCH] aospa: products: update OnePlus 7 to vauxite This also introduces the OnePlus 7T Pro NR, and replaces https://gerrit.aospa.co/c/AOSPA/android_vendor_aospa/+/41634 Change-Id: Id98d2c762a9c0928169662e0d070c17855089234 --- products/AndroidProducts.mk | 1 + products/oneplus7/beans.xml | 12 ++--- products/oneplus7/common.xml | 14 ++++++ products/oneplus7pro/beans.xml | 12 ++--- products/oneplus7t/beans.xml | 12 ++--- products/oneplus7tpro/beans.xml | 12 ++--- .../oneplus7tpronr/aospa_oneplus7tpronr.mk | 48 +++++++++++++++++++ products/oneplus7tpronr/beans.xml | 10 ++++ 8 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 products/oneplus7/common.xml create mode 100644 products/oneplus7tpronr/aospa_oneplus7tpronr.mk create mode 100644 products/oneplus7tpronr/beans.xml diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index 9d61def9..dab20f07 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -34,6 +34,7 @@ PRODUCT_MAKEFILES += \ $(LOCAL_DIR)/oneplus7pro/aospa_oneplus7pro.mk \ $(LOCAL_DIR)/oneplus7t/aospa_oneplus7t.mk \ $(LOCAL_DIR)/oneplus7tpro/aospa_oneplus7tpro.mk \ + $(LOCAL_DIR)/oneplus7tpronr/aospa_oneplus7tpronr.mk \ $(LOCAL_DIR)/oneplus9/aospa_oneplus9.mk \ $(LOCAL_DIR)/pdx234/aospa_pdx234.mk \ $(LOCAL_DIR)/phoenix/aospa_phoenix.mk \ diff --git a/products/oneplus7/beans.xml b/products/oneplus7/beans.xml index 18729e51..313455f3 100644 --- a/products/oneplus7/beans.xml +++ b/products/oneplus7/beans.xml @@ -4,13 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> - - + - - - - - - - \ No newline at end of file + + diff --git a/products/oneplus7/common.xml b/products/oneplus7/common.xml new file mode 100644 index 00000000..886d4b7c --- /dev/null +++ b/products/oneplus7/common.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/products/oneplus7pro/beans.xml b/products/oneplus7pro/beans.xml index c0b0705b..55244522 100644 --- a/products/oneplus7pro/beans.xml +++ b/products/oneplus7pro/beans.xml @@ -4,13 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> - - + - - - - - - - \ No newline at end of file + + diff --git a/products/oneplus7t/beans.xml b/products/oneplus7t/beans.xml index c2910b92..db3f6293 100644 --- a/products/oneplus7t/beans.xml +++ b/products/oneplus7t/beans.xml @@ -4,13 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> - - + - - - - - - - \ No newline at end of file + + diff --git a/products/oneplus7tpro/beans.xml b/products/oneplus7tpro/beans.xml index 2b336880..79b3b484 100644 --- a/products/oneplus7tpro/beans.xml +++ b/products/oneplus7tpro/beans.xml @@ -4,13 +4,7 @@ SPDX-License-Identifier: Apache-2.0 --> - - + - - - - - - - \ No newline at end of file + + diff --git a/products/oneplus7tpronr/aospa_oneplus7tpronr.mk b/products/oneplus7tpronr/aospa_oneplus7tpronr.mk new file mode 100644 index 00000000..6686e124 --- /dev/null +++ b/products/oneplus7tpronr/aospa_oneplus7tpronr.mk @@ -0,0 +1,48 @@ +# Copyright (C) 2023 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 (aospa_oneplus7tpronr,$(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) + +# Inherit from the custom device configuration. +$(call inherit-product, device/oneplus/oneplus7tpronr/device.mk) + +# Inherit from the AOSPA configuration. +$(call inherit-product, vendor/aospa/target/product/aospa-target.mk) + +# Override AOSP build properties +PRODUCT_NAME := aospa_oneplus7tpronr +PRODUCT_DEVICE := oneplus7tpronr +PRODUCT_BRAND := OnePlus +PRODUCT_MODEL := HD1925 +PRODUCT_MANUFACTURER := OnePlus + +PRODUCT_GMS_CLIENTID_BASE := android-oneplus + +# Boot animation resolution. +TARGET_BOOT_ANIMATION_RES := 1440 + +PRODUCT_SYSTEM_NAME := OnePlus7TProNR +PRODUCT_SYSTEM_DEVICE := OnePlus7TProNR + +PRODUCT_BUILD_PROP_OVERRIDES += \ + TARGET_DEVICE=OnePlus7TProNR \ + TARGET_PRODUCT=OnePlus7TProNR + +endif + diff --git a/products/oneplus7tpronr/beans.xml b/products/oneplus7tpronr/beans.xml new file mode 100644 index 00000000..12341994 --- /dev/null +++ b/products/oneplus7tpronr/beans.xml @@ -0,0 +1,10 @@ + + + + + + +