From 977f347ce7b7be385a93b4653d88ac3d114574ec Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 25 May 2021 18:04:27 +0100 Subject: [PATCH] lemonadep: Initial device tree conversion Change-Id: I943e61b56a9e42b228dbed3872037ed84f933d48 --- Android.mk | 4 ++-- AndroidProducts.mk | 10 +++++----- BoardConfig.mk | 16 +++++++-------- bluetooth/include/bdroid_buildcfg.h | 2 +- device.mk | 12 +++++------ extract-files.sh | 4 ++-- lineage.dependencies | 4 ++-- ..._instantnoodlep.mk => lineage_lemonadep.mk | 20 +++++++++---------- .../SettingsProvider/res/values/defaults.xml | 2 +- setup-makefiles.sh | 4 ++-- 10 files changed, 39 insertions(+), 39 deletions(-) rename lineage_instantnoodlep.mk => lineage_lemonadep.mk (67%) diff --git a/Android.mk b/Android.mk index 934b70f..df27c37 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 The LineageOS Project +# Copyright (C) 2021 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. @@ -27,6 +27,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),instantnoodlep) +ifeq ($(TARGET_DEVICE),lemonadep) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index fb89105..59521bf 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 The LineageOS Project +# Copyright (C) 2021 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. @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_instantnoodlep.mk + $(LOCAL_DIR)/lineage_lemonadep.mk COMMON_LUNCH_CHOICES := \ - lineage_instantnoodlep-user \ - lineage_instantnoodlep-userdebug \ - lineage_instantnoodlep-eng + lineage_lemonadep-user \ + lineage_lemonadep-userdebug \ + lineage_lemonadep-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index d824f87..914864d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 The LineageOS Project +# Copyright (C) 2021 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. @@ -14,18 +14,18 @@ # limitations under the License. # -# Inherit from oneplus sm8250-common --include device/oneplus/sm8250-common/BoardConfigCommon.mk +# Inherit from oneplus sm8350-common +-include device/oneplus/sm8350-common/BoardConfigCommon.mk -DEVICE_PATH := device/oneplus/instantnoodlep +DEVICE_PATH := device/oneplus/lemonadep # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include # Fingerprint -SOONG_CONFIG_ONEPLUS_KONA_FOD_POS_X = 604 -SOONG_CONFIG_ONEPLUS_KONA_FOD_POS_Y = 2434 -SOONG_CONFIG_ONEPLUS_KONA_FOD_SIZE = 232 +SOONG_CONFIG_ONEPLUS_LAHAINA_FOD_POS_X = 604 +SOONG_CONFIG_ONEPLUS_LAHAINA_FOD_POS_Y = 2434 +SOONG_CONFIG_ONEPLUS_LAHAINA_FOD_SIZE = 232 # HIDL DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml @@ -47,4 +47,4 @@ TARGET_RECOVERY_DENSITY := xxhdpi TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom # inherit from the proprietary version --include vendor/oneplus/instantnoodlep/BoardConfigVendor.mk +-include vendor/oneplus/lemonadep/BoardConfigVendor.mk diff --git a/bluetooth/include/bdroid_buildcfg.h b/bluetooth/include/bdroid_buildcfg.h index 1a51552..1bafe5f 100644 --- a/bluetooth/include/bdroid_buildcfg.h +++ b/bluetooth/include/bdroid_buildcfg.h @@ -22,7 +22,7 @@ #ifndef _BDROID_BUILDCFG_H #define _BDROID_BUILDCFG_H -#define BTM_DEF_LOCAL_NAME "OnePlus 8 Pro" +#define BTM_DEF_LOCAL_NAME "OnePlus 9 Pro" // Disables read remote device feature #define MAX_ACL_CONNECTIONS 16 #define MAX_L2CAP_CHANNELS 16 diff --git a/device.mk b/device.mk index 3a5dd91..b819ee7 100644 --- a/device.mk +++ b/device.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 The LineageOS Project +# Copyright (C) 2021 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. @@ -50,12 +50,12 @@ PRODUCT_COPY_FILES += \ # PowerShare PRODUCT_PACKAGES += \ - vendor.lineage.powershare@1.0-service.oneplus_kona + vendor.lineage.powershare@1.0-service.oneplus_lahaina -PRODUCT_SHIPPING_API_LEVEL := 29 +PRODUCT_SHIPPING_API_LEVEL := 30 -# Inherit from oneplus sm8250-common -$(call inherit-product, device/oneplus/sm8250-common/common.mk) +# Inherit from oneplus sm8350-common +$(call inherit-product, device/oneplus/sm8350-common/common.mk) # Inherit from vendor blobs -$(call inherit-product, vendor/oneplus/instantnoodlep/instantnoodlep-vendor.mk) +$(call inherit-product, vendor/oneplus/lemonadep/lemonadep-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 22c83c1..b937852 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -14,8 +14,8 @@ fi set -e -export DEVICE=instantnoodlep -export DEVICE_COMMON=sm8250-common +export DEVICE=lemonadep +export DEVICE_COMMON=sm8350-common export VENDOR=oneplus "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/lineage.dependencies b/lineage.dependencies index 8175381..4129e3d 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_oneplus_sm8250-common", - "target_path": "device/oneplus/sm8250-common" + "repository": "android_device_oneplus_sm8350-common", + "target_path": "device/oneplus/sm8350-common" } ] diff --git a/lineage_instantnoodlep.mk b/lineage_lemonadep.mk similarity index 67% rename from lineage_instantnoodlep.mk rename to lineage_lemonadep.mk index 09af4e9..6cd31be 100644 --- a/lineage_instantnoodlep.mk +++ b/lineage_lemonadep.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 The LineageOS Project +# Copyright (C) 2021 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. @@ -18,23 +18,23 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from instantnoodlep device -$(call inherit-product, device/oneplus/instantnoodlep/device.mk) +# Inherit from lemonadep device +$(call inherit-product, device/oneplus/lemonadep/device.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) -PRODUCT_NAME := lineage_instantnoodlep -PRODUCT_DEVICE := instantnoodlep +PRODUCT_NAME := lineage_lemonadep +PRODUCT_DEVICE := lemonadep PRODUCT_MANUFACTURER := OnePlus PRODUCT_BRAND := OnePlus -PRODUCT_MODEL := IN2023 +PRODUCT_MODEL := LE2123 PRODUCT_GMS_CLIENTID_BASE := android-oneplus PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_DEVICE=OnePlus8Pro \ - PRODUCT_NAME=OnePlus8Pro_EEA \ - PRIVATE_BUILD_DESC="OnePlus8Pro-user 11 release-keys" + PRODUCT_DEVICE=OnePlus9Pro \ + PRODUCT_NAME=OnePlus9Pro_EEA \ + PRIVATE_BUILD_DESC="OnePlus9Pro-user 11 release-keys" -BUILD_FINGERPRINT := OnePlus/OnePlus8Pro/OnePlus8Pro:10/QKQ1.191222.002/2005301332:user/release-keys +BUILD_FINGERPRINT := OnePlus/OnePlus9Pro_EEA/OnePlus9Pro:11/RKQ1.201105.002/2105011307:user/release-keys diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index 91a4e24..aea05c1 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -18,5 +18,5 @@ --> - OnePlus 8 Pro + OnePlus 9 Pro diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 2048024..081d950 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,8 +8,8 @@ set -e -export DEVICE=instantnoodlep -export DEVICE_COMMON=sm8250-common +export DEVICE=lemonadep +export DEVICE_COMMON=sm8350-common export VENDOR=oneplus "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"