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
This commit is contained in:
Timo Dorfner 2024-10-06 21:28:46 +02:00 committed by Fazil Sheik
parent f3fb646f19
commit ab03f382de
8 changed files with 85 additions and 36 deletions

View File

@ -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 \

View File

@ -4,13 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../platforms/msmnile.xml" />
<remove-project name="AOSPA/android_hardware_qcom_gps" />
<include name="common.xml" />
<project path="device/oneplus/common" name="aospa-op7/device_oneplus_common" remote="github" revision="topaz" />
<project path="device/oneplus/oneplus7" name="AOSPA/android_device_oneplus_oneplus7" remote="aospa" revision="topaz" />
<project path="device/oneplus/sm8150-common" name="AOSPA/android_device_oneplus_sm8150-common" remote="aospa" revision="topaz" />
<project path="kernel/msm-4.14" name="AOSPA/android_kernel_oneplus_sm8150" remote="aospa" revision="topaz" />
<project path="vendor/oneplus" name="proprietary_vendor_oneplus" remote="blobs" revision="topaz" clone-depth="1" />
<project path="vendor/oneplus/firmware" name="proprietary_vendor_oneplus_firmware" remote="blobs-gitlab" revision="topaz" clone-depth="1" />
</manifest>
<project path="device/oneplus/oneplus7" name="AOSPA/android_device_oneplus_oneplus7" remote="aospa" revision="vauxite" />
</manifest>

View File

@ -0,0 +1,14 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
SPDX-FileCopyrightText: 2024 Paranoid Android
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../platforms/msmnile.xml" />
<remove-project name="AOSPA/android_hardware_qcom_gps" />
<project path="device/oneplus/common" name="aospa-op7/device_oneplus_common" remote="github" revision="vauxite" />
<project path="device/oneplus/sm8150-common" name="AOSPA/android_device_oneplus_sm8150-common" remote="aospa" revision="vauxite" />
<project path="kernel/msm-4.14" name="AOSPA/android_kernel_oneplus_sm8150" remote="aospa" revision="vauxite" />
<project path="vendor/oneplus" name="proprietary_vendor_oneplus" remote="blobs" revision="vauxite" clone-depth="1" />
</manifest>

View File

@ -4,13 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../platforms/msmnile.xml" />
<remove-project name="AOSPA/android_hardware_qcom_gps" />
<include name="../oneplus7/common.xml" />
<project path="device/oneplus/common" name="aospa-op7/device_oneplus_common" remote="github" revision="topaz" />
<project path="device/oneplus/oneplus7pro" name="AOSPA/android_device_oneplus_oneplus7pro" remote="aospa" revision="topaz" />
<project path="device/oneplus/sm8150-common" name="AOSPA/android_device_oneplus_sm8150-common" remote="aospa" revision="topaz" />
<project path="kernel/msm-4.14" name="AOSPA/android_kernel_oneplus_sm8150" remote="aospa" revision="topaz" />
<project path="vendor/oneplus" name="proprietary_vendor_oneplus" remote="blobs" revision="topaz" clone-depth="1" />
<project path="vendor/oneplus/firmware" name="proprietary_vendor_oneplus_firmware" remote="blobs-gitlab" revision="topaz" clone-depth="1" />
</manifest>
<project path="device/oneplus/oneplus7pro" name="AOSPA/android_device_oneplus_oneplus7pro" remote="aospa" revision="vauxite" />
</manifest>

View File

@ -4,13 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../platforms/msmnile.xml" />
<remove-project name="AOSPA/android_hardware_qcom_gps" />
<include name="../oneplus7/common.xml" />
<project path="device/oneplus/common" name="aospa-op7/device_oneplus_common" remote="github" revision="topaz" />
<project path="device/oneplus/oneplus7t" name="AOSPA/android_device_oneplus_oneplus7t" remote="aospa" revision="topaz" />
<project path="device/oneplus/sm8150-common" name="AOSPA/android_device_oneplus_sm8150-common" remote="aospa" revision="topaz" />
<project path="kernel/msm-4.14" name="AOSPA/android_kernel_oneplus_sm8150" remote="aospa" revision="topaz" />
<project path="vendor/oneplus" name="proprietary_vendor_oneplus" remote="blobs" revision="topaz" clone-depth="1" />
<project path="vendor/oneplus/firmware" name="proprietary_vendor_oneplus_firmware" remote="blobs-gitlab" revision="topaz" clone-depth="1" />
</manifest>
<project path="device/oneplus/oneplus7t" name="AOSPA/android_device_oneplus_oneplus7t" remote="aospa" revision="vauxite" />
</manifest>

View File

@ -4,13 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../platforms/msmnile.xml" />
<remove-project name="AOSPA/android_hardware_qcom_gps" />
<include name="../oneplus7/common.xml" />
<project path="device/oneplus/common" name="aospa-op7/device_oneplus_common" remote="github" revision="topaz" />
<project path="device/oneplus/oneplus7tpro" name="AOSPA/android_device_oneplus_oneplus7tpro" remote="aospa" revision="topaz" />
<project path="device/oneplus/sm8150-common" name="AOSPA/android_device_oneplus_sm8150-common" remote="aospa" revision="topaz" />
<project path="kernel/msm-4.14" name="AOSPA/android_kernel_oneplus_sm8150" remote="aospa" revision="topaz" />
<project path="vendor/oneplus" name="proprietary_vendor_oneplus" remote="blobs" revision="topaz" clone-depth="1" />
<project path="vendor/oneplus/firmware" name="proprietary_vendor_oneplus_firmware" remote="blobs-gitlab" revision="topaz" clone-depth="1" />
</manifest>
<project path="device/oneplus/oneplus7tpro" name="AOSPA/android_device_oneplus_oneplus7tpro" remote="aospa" revision="vauxite" />
</manifest>

View File

@ -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

View File

@ -0,0 +1,10 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
SPDX-FileCopyrightText: 2024 Paranoid Android
SPDX-License-Identifier: Apache-2.0
-->
<manifest>
<include name="../oneplus7/common.xml" />
<project path="device/oneplus/oneplus7tpronr" name="AOSPA/android_device_oneplus_oneplus7tpronr" remote="aospa" revision="vauxite" />
</manifest>