From 410e7ff323e63a35675921de1449157a1f512241 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 25 May 2021 17:54:59 +0100 Subject: [PATCH] sm8350-common: Initial common device tree conversion Change-Id: I0d7188b3fa82dddf3f9fb9523d716a8f15f46184 --- Android.mk | 4 +- BoardConfigCommon.mk | 24 ++++++------ bootctrl/Android.bp | 6 +-- common.mk | 38 +++++++++---------- ...decs_kona.xml => media_codecs_lahaina.xml} | 0 ...l => media_codecs_performance_lahaina.xml} | 0 ...es_kona.xml => media_profiles_lahaina.xml} | 0 fingerprint/Android.bp | 6 +-- ...ingerprint@2.1-service.oneplus_lahaina.rc} | 2 +- ...ngerprint@2.1-service.oneplus_lahaina.xml} | 0 fod/Android.bp | 10 ++--- fod/service.cpp | 2 +- ...t.inscreen@1.0-service.oneplus_lahaina.rc} | 2 +- ....inscreen@1.0-service.oneplus_lahaina.xml} | 0 gpt-utils/Android.bp | 2 +- lineage.dependencies | 4 +- livedisplay/Android.bp | 6 +-- livedisplay/service.cpp | 2 +- ...ivedisplay@2.1-service.oneplus_lahaina.rc} | 2 +- ...vedisplay@2.1-service.oneplus_lahaina.xml} | 0 oneplus-fwk/Android.bp | 2 +- powershare/Android.bp | 6 +-- powershare/service.cpp | 2 +- ...powershare@1.0-service.oneplus_lahaina.rc} | 2 +- ...owershare@1.0-service.oneplus_lahaina.xml} | 0 rootdir/etc/init.target.rc | 7 +--- sepolicy/vendor/file_contexts | 10 ++--- setup-makefiles.sh | 2 +- soong/Android.bp | 4 +- soong/fod.go | 4 +- soong/main.go | 4 +- system.prop | 2 +- touch/Android.bp | 6 +-- touch/service.cpp | 2 +- ...eage.touch@1.0-service.oneplus_lahaina.rc} | 2 +- ...age.touch@1.0-service.oneplus_lahaina.xml} | 0 vendor.prop | 4 +- vibrator/Android.bp | 4 +- ...8.ini => WCNSS_qcom_cfg_cta_lahaina_8.ini} | 0 39 files changed, 85 insertions(+), 88 deletions(-) rename configs/{media_codecs_kona.xml => media_codecs_lahaina.xml} (100%) rename configs/{media_codecs_performance_kona.xml => media_codecs_performance_lahaina.xml} (100%) rename configs/{media_profiles_kona.xml => media_profiles_lahaina.xml} (100%) rename fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc => android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc} (89%) rename fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml => android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml} (100%) rename fod/{vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc => vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc} (77%) rename fod/{vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml => vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml} (100%) rename livedisplay/{vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc => vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc} (89%) rename livedisplay/{vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml => vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml} (100%) rename powershare/{vendor.lineage.powershare@1.0-service.oneplus_kona.rc => vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc} (74%) rename powershare/{vendor.lineage.powershare@1.0-service.oneplus_kona.xml => vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml} (100%) rename touch/{vendor.lineage.touch@1.0-service.oneplus_kona.rc => vendor.lineage.touch@1.0-service.oneplus_lahaina.rc} (97%) rename touch/{vendor.lineage.touch@1.0-service.oneplus_kona.xml => vendor.lineage.touch@1.0-service.oneplus_lahaina.xml} (100%) rename wifi/qca6390/{WCNSS_qcom_cfg_cta_kona_8.ini => WCNSS_qcom_cfg_cta_lahaina_8.ini} (100%) diff --git a/Android.mk b/Android.mk index 130267f..81ca7bb 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. @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter instantnoodle instantnoodlep kebab,$(TARGET_DEVICE)),) +ifneq ($(filter lemonade lemonadep,$(TARGET_DEVICE)),) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f7981d8..22b952a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.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,7 +18,7 @@ BUILD_BROKEN_DUP_RULES := true BOARD_VENDOR := oneplus -COMMON_PATH := device/oneplus/sm8250-common +COMMON_PATH := device/oneplus/sm8350-common # Architecture TARGET_ARCH := arm64 @@ -38,7 +38,7 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385 TARGET_USES_64_BIT_BINDER := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := kona +TARGET_BOOTLOADER_BOARD_NAME := lahaina TARGET_NO_BOOTLOADER := true # Kernel @@ -50,14 +50,14 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DTBO := true BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc OEM_TARGET_PRODUCT=$(PRODUCT_DEVICE) -TARGET_KERNEL_SOURCE := kernel/oneplus/sm8250 +TARGET_KERNEL_SOURCE := kernel/oneplus/sm8350 TARGET_KERNEL_CLANG_COMPILE := true -TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig +TARGET_KERNEL_CONFIG := vendor/lahaina-qgki_defconfig # Platform BOARD_USES_QCOM_HARDWARE := true -TARGET_BOARD_PLATFORM := kona -TARGET_BOARD_PLATFORM_GPU := qcom-adreno650 +TARGET_BOARD_PLATFORM := lahaina +TARGET_BOARD_PLATFORM_GPU := qcom-adreno660 # Properties TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop @@ -123,9 +123,9 @@ TARGET_ENABLE_MEDIADRM_64 := true TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs # Fingerprint -SOONG_CONFIG_NAMESPACES += ONEPLUS_KONA_FOD -SOONG_CONFIG_ONEPLUS_KONA_FOD := POS_X POS_Y SIZE -TARGET_SURFACEFLINGER_FOD_LIB := //$(COMMON_PATH):libfod_extension.oneplus_kona +SOONG_CONFIG_NAMESPACES += ONEPLUS_LAHAINA_FOD +SOONG_CONFIG_ONEPLUS_LAHAINA_FOD := POS_X POS_Y SIZE +TARGET_SURFACEFLINGER_FOD_LIB := //$(COMMON_PATH):libfod_extension.oneplus_lahaina # HIDL DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/device_framework_matrix.xml @@ -208,4 +208,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # Inherit from the proprietary version --include vendor/oneplus/sm8250-common/BoardConfigVendor.mk +-include vendor/oneplus/sm8350-common/BoardConfigVendor.mk diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp index 4b298a3..5983417 100644 --- a/bootctrl/Android.bp +++ b/bootctrl/Android.bp @@ -15,14 +15,14 @@ // cc_library { - name: "bootctrl.kona", + name: "bootctrl.lahaina", defaults: ["bootctrl_hal_defaults"], - static_libs: ["libgptutils.oneplus_kona"], + static_libs: ["libgptutils.oneplus_lahaina"], } cc_library_shared { name: "android.hardware.boot@1.1-impl-qti", stem: "android.hardware.boot@1.0-impl-1.1-qti", defaults: ["android.hardware.boot@1.1-impl-qti_defaults"], - static_libs: ["libgptutils.oneplus_kona"], + static_libs: ["libgptutils.oneplus_lahaina"], } diff --git a/common.mk b/common.mk index fc72baf..1fbf150 100644 --- a/common.mk +++ b/common.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. @@ -21,7 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) # Get non-open-source specific aspects -$(call inherit-product, vendor/oneplus/sm8250-common/sm8250-common-vendor.mk) +$(call inherit-product, vendor/oneplus/sm8350-common/sm8350-common-vendor.mk) # Additional native libraries PRODUCT_COPY_FILES += \ @@ -122,10 +122,10 @@ PRODUCT_PACKAGES += \ android.hardware.soundtrigger@2.3-impl \ audio.a2dp.default \ audio.bluetooth.default \ - audio.primary.kona \ + audio.primary.lahaina \ audio.r_submix.default \ audio.usb.default \ - audio_amplifier.kona \ + audio_amplifier.lahaina \ liba2dpoffload \ libaudiopreprocessing \ libbatterylistener \ @@ -175,8 +175,8 @@ PRODUCT_PACKAGES += \ android.hardware.boot@1.1-impl-qti \ android.hardware.boot@1.1-impl-qti.recovery \ android.hardware.boot@1.1-service \ - bootctrl.kona \ - bootctrl.kona.recovery + bootctrl.lahaina \ + bootctrl.lahaina.recovery PRODUCT_PACKAGES_DEBUG += \ bootctl @@ -232,7 +232,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl-qti-display \ android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-service \ - gralloc.kona \ + gralloc.lahaina \ libdisplayconfig.qti \ libdisplayconfig.qti.vendor \ libqdMetaData \ @@ -240,7 +240,7 @@ PRODUCT_PACKAGES += \ libsdmutils \ libtinyxml \ libvulkan \ - memtrack.kona \ + memtrack.lahaina \ vendor.display.config@1.0 \ vendor.display.config@1.0.vendor \ vendor.display.config@1.1.vendor \ @@ -277,8 +277,8 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona \ - vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona \ + android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina \ + vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina \ vendor.oneplus.fingerprint.extension@1.0 \ vendor.oneplus.hardware.display@1.0 @@ -319,19 +319,19 @@ PRODUCT_PACKAGES += \ # LiveDisplay PRODUCT_PACKAGES += \ - vendor.lineage.livedisplay@2.1-service.oneplus_kona + vendor.lineage.livedisplay@2.1-service.oneplus_lahaina # Media PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(LOCAL_PATH)/configs/media_codecs_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_kona.xml \ + $(LOCAL_PATH)/configs/media_codecs_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media_codecs_performance_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_kona.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(LOCAL_PATH)/configs/media_profiles_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_kona.xml \ + $(LOCAL_PATH)/configs/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml \ $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \ $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml @@ -381,10 +381,10 @@ PRODUCT_PACKAGES += \ # OnePlus PRODUCT_PACKAGES += \ - oneplus-fwk.oneplus_kona + oneplus-fwk.oneplus_lahaina PRODUCT_BOOT_JARS += \ - oneplus-fwk.oneplus_kona + oneplus-fwk.oneplus_lahaina # Power PRODUCT_PACKAGES += \ @@ -437,7 +437,7 @@ PRODUCT_COPY_FILES += \ # Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.oneplus_kona + vendor.lineage.touch@1.0-service.oneplus_lahaina # tri-state-key PRODUCT_PACKAGES += \ @@ -471,7 +471,7 @@ PRODUCT_PACKAGES += \ # Vibrator PRODUCT_PACKAGES += \ - vendor.qti.hardware.vibrator.service.oneplus_kona + vendor.qti.hardware.vibrator.service.oneplus_lahaina # Seccomp policy PRODUCT_COPY_FILES += \ @@ -495,7 +495,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg.ini \ - $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini \ + $(LOCAL_PATH)/wifi/qca6390/WCNSS_qcom_cfg_cta_lahaina_8.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6390/WCNSS_qcom_cfg_cta_lahaina_8.ini \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg_roam.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg_roam.ini \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg_setchain.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg_setchain.ini \ $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ diff --git a/configs/media_codecs_kona.xml b/configs/media_codecs_lahaina.xml similarity index 100% rename from configs/media_codecs_kona.xml rename to configs/media_codecs_lahaina.xml diff --git a/configs/media_codecs_performance_kona.xml b/configs/media_codecs_performance_lahaina.xml similarity index 100% rename from configs/media_codecs_performance_kona.xml rename to configs/media_codecs_performance_lahaina.xml diff --git a/configs/media_profiles_kona.xml b/configs/media_profiles_lahaina.xml similarity index 100% rename from configs/media_profiles_kona.xml rename to configs/media_profiles_lahaina.xml diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index aa8db63..43345b0 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -1,8 +1,8 @@ cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona", + name: "android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina", defaults: ["hidl_defaults"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc"], - vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc"], + vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml"], vendor: true, relative_install_path: "hw", srcs: [ diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc similarity index 89% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc index 081632e..256fcb9 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina # "class hal" causes a race condition on some devices due to files created # in /data. As a workaround, postpone startup until later in boot once # /data is mounted. diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml similarity index 100% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml diff --git a/fod/Android.bp b/fod/Android.bp index 49dbb6e..8371e78 100644 --- a/fod/Android.bp +++ b/fod/Android.bp @@ -13,12 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -oneplus_kona_fod_hal_binary { +oneplus_lahaina_fod_hal_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona", - init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"], - vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml"], + name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina", + init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc"], + vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml"], srcs: ["service.cpp", "FingerprintInscreen.cpp"], shared_libs: [ "libbase", @@ -34,7 +34,7 @@ oneplus_kona_fod_hal_binary { } cc_library_static { - name: "libfod_extension.oneplus_kona", + name: "libfod_extension.oneplus_lahaina", srcs: ["FodExtension.cpp"], include_dirs: [ "frameworks/native/services/surfaceflinger/CompositionEngine/include" diff --git a/fod/service.cpp b/fod/service.cpp index 9b7b463..83fd7ad 100644 --- a/fod/service.cpp +++ b/fod/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona" +#define LOG_TAG "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina" #include #include diff --git a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc similarity index 77% rename from fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc rename to fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc index faba1b1..4480a6c 100644 --- a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc +++ b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc @@ -1,4 +1,4 @@ -service vendor.fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona +service vendor.fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default class hal user system diff --git a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml similarity index 100% rename from fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml rename to fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index bdf3b04..e1d4059 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -16,7 +16,7 @@ cc_library { - name: "libgptutils.oneplus_kona", + name: "libgptutils.oneplus_lahaina", vendor: true, recovery_available: true, shared_libs: [ diff --git a/lineage.dependencies b/lineage.dependencies index 2e4b00c..f2f83de 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -4,7 +4,7 @@ "target_path": "device/oneplus/common" }, { - "repository": "android_kernel_oneplus_sm8250", - "target_path": "kernel/oneplus/sm8250" + "repository": "android_kernel_oneplus_sm8350", + "target_path": "kernel/oneplus/sm8350" } ] diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index cddbf37..d29f7b8 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.livedisplay@2.1-service.oneplus_kona", - init_rc: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc"], - vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml"], + name: "vendor.lineage.livedisplay@2.1-service.oneplus_lahaina", + init_rc: ["vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc"], + vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ diff --git a/livedisplay/service.cpp b/livedisplay/service.cpp index 437d765..cfd63d1 100644 --- a/livedisplay/service.cpp +++ b/livedisplay/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.oneplus_kona" +#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.oneplus_lahaina" #include #include diff --git a/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc similarity index 89% rename from livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc rename to livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc index eaa91c2..d43577c 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc @@ -4,7 +4,7 @@ on init chmod 0666 /sys/class/drm/card0-DSI-1/dimlayer_bl_en chmod 0666 /sys/class/drm/card0-DSI-1/hbm -service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.oneplus_kona +service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina class hal user system group system diff --git a/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml b/livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml similarity index 100% rename from livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml rename to livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml diff --git a/oneplus-fwk/Android.bp b/oneplus-fwk/Android.bp index f122d0d..4f2b4b5 100644 --- a/oneplus-fwk/Android.bp +++ b/oneplus-fwk/Android.bp @@ -1,5 +1,5 @@ java_library { - name: "oneplus-fwk.oneplus_kona", + name: "oneplus-fwk.oneplus_lahaina", installable: true, srcs: [ diff --git a/powershare/Android.bp b/powershare/Android.bp index 93b9431..05dbfc2 100644 --- a/powershare/Android.bp +++ b/powershare/Android.bp @@ -16,9 +16,9 @@ cc_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "vendor.lineage.powershare@1.0-service.oneplus_kona", - init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_kona.rc"], - vintf_fragments: ["vendor.lineage.powershare@1.0-service.oneplus_kona.xml"], + name: "vendor.lineage.powershare@1.0-service.oneplus_lahaina", + init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc"], + vintf_fragments: ["vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml"], srcs: ["service.cpp", "PowerShare.cpp"], shared_libs: [ "libbase", diff --git a/powershare/service.cpp b/powershare/service.cpp index adf33d4..88e0062 100644 --- a/powershare/service.cpp +++ b/powershare/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.powershare@1.0-service.oneplus_kona" +#define LOG_TAG "vendor.lineage.powershare@1.0-service.oneplus_lahaina" #include #include diff --git a/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc b/powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc similarity index 74% rename from powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc rename to powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc index caf28b1..5dc2fe4 100644 --- a/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc +++ b/powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc @@ -1,4 +1,4 @@ -service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.oneplus_kona +service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.oneplus_lahaina class hal user system group system diff --git a/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml b/powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml similarity index 100% rename from powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml rename to powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index f71708d..0200bf5 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -279,11 +279,8 @@ service dcvs-sh /vendor/bin/init.qti.dcvs.sh on property:vendor.dcvs.prop=1 start dcvs-sh -on property:ro.boot.project_codename=instantnoodle +on property:ro.boot.project_codename=lemonade setprop persist.radio.multisim.config dsds -on property:ro.boot.project_codename=instantnoodlep - setprop persist.radio.multisim.config dsds - -on property:ro.boot.project_codename=kebab +on property:ro.boot.project_codename=lemonadep setprop persist.radio.multisim.config dsds diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 462e0ec..5122832 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -48,11 +48,11 @@ /dev/wlchg u:object_r:wlchg_device:s0 # HALs -/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.oneplus_kona u:object_r:hal_fingerprint_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.oneplus_kona u:object_r:hal_lineage_fod_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.oneplus_kona u:object_r:hal_lineage_livedisplay_qti_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.powershare@1\.0-service\.oneplus_kona u:object_r:hal_lineage_powershare_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus_kona u:object_r:hal_lineage_touch_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.oneplus_lahaina u:object_r:hal_fingerprint_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.oneplus_lahaina u:object_r:hal_lineage_fod_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.oneplus_lahaina u:object_r:hal_lineage_livedisplay_qti_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.powershare@1\.0-service\.oneplus_lahaina u:object_r:hal_lineage_powershare_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus_lahaina u:object_r:hal_lineage_touch_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.camera@1\.0-service u:object_r:hal_cameraHIDL_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.CameraMDMHIDL@1\.0-service u:object_r:hal_cameraHIDL_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.display@1\.0-service u:object_r:hal_display_default_exec:s0 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 251dc57..66c0e50 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -25,7 +25,7 @@ source "${HELPER}" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true # Warning headers and guards -write_headers "instantnoodle instantnoodlep kebab" +write_headers "lemonade lemonadep" # The standard common blobs write_makefiles "${MY_DIR}/proprietary-files.txt" true diff --git a/soong/Android.bp b/soong/Android.bp index fa070e6..e6b7b57 100644 --- a/soong/Android.bp +++ b/soong/Android.bp @@ -1,6 +1,6 @@ bootstrap_go_package { - name: "soong-oneplus-kona-plugins", - pkgPath: "device/oneplus/sm8250-common", + name: "soong-oneplus-lahaina-plugins", + pkgPath: "device/oneplus/sm8350-common", deps: [ "blueprint", "blueprint-pathtools", diff --git a/soong/fod.go b/soong/fod.go index 00679d7..f6d5093 100644 --- a/soong/fod.go +++ b/soong/fod.go @@ -1,4 +1,4 @@ -package kona +package lahaina import ( "android/soong/android" @@ -9,7 +9,7 @@ import ( func fodFlags(ctx android.BaseContext) []string { var cflags []string - var config = ctx.AConfig().VendorConfig("ONEPLUS_KONA_FOD") + var config = ctx.AConfig().VendorConfig("ONEPLUS_LAHAINA_FOD") var posX = strings.TrimSpace(config.String("POS_X")) var posY = strings.TrimSpace(config.String("POS_Y")) var size = strings.TrimSpace(config.String("SIZE")) diff --git a/soong/main.go b/soong/main.go index bc1d727..938e389 100644 --- a/soong/main.go +++ b/soong/main.go @@ -1,9 +1,9 @@ -package kona +package lahaina import ( "android/soong/android" ) func init() { - android.RegisterModuleType("oneplus_kona_fod_hal_binary", fodHalBinaryFactory) + android.RegisterModuleType("oneplus_lahaina_fod_hal_binary", fodHalBinaryFactory) } diff --git a/system.prop b/system.prop index 40ae605..27a2d84 100644 --- a/system.prop +++ b/system.prop @@ -34,7 +34,7 @@ vendor.iop.enable_uxe=0 media.settings.xml=/vendor/etc/media_profiles_vendor.xml # Netflix -ro.netflix.bsp_rev=Q8250-19134-1 +ro.netflix.bsp_rev=Q875-32408-1 # Perf ro.vendor.qti.core_ctl_max_cpu=4 diff --git a/touch/Android.bp b/touch/Android.bp index 004e94c..1538283 100644 --- a/touch/Android.bp +++ b/touch/Android.bp @@ -14,9 +14,9 @@ // limitations under the License. cc_binary { - name: "vendor.lineage.touch@1.0-service.oneplus_kona", - init_rc: ["vendor.lineage.touch@1.0-service.oneplus_kona.rc"], - vintf_fragments: ["vendor.lineage.touch@1.0-service.oneplus_kona.xml"], + name: "vendor.lineage.touch@1.0-service.oneplus_lahaina", + init_rc: ["vendor.lineage.touch@1.0-service.oneplus_lahaina.rc"], + vintf_fragments: ["vendor.lineage.touch@1.0-service.oneplus_lahaina.xml"], defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ diff --git a/touch/service.cpp b/touch/service.cpp index c163e05..d3bdf04 100644 --- a/touch/service.cpp +++ b/touch/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.touch@1.0-service.oneplus_kona" +#define LOG_TAG "vendor.lineage.touch@1.0-service.oneplus_lahaina" #include #include diff --git a/touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc b/touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.rc similarity index 97% rename from touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc rename to touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.rc index 00a5bb2..1276706 100644 --- a/touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc +++ b/touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.rc @@ -18,7 +18,7 @@ on boot chown system system /proc/touchpanel/right_arrow_enable chown system system /proc/touchpanel/single_tap_enable -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.oneplus_kona +service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.oneplus_lahaina class hal user system group system diff --git a/touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml b/touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.xml similarity index 100% rename from touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml rename to touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.xml diff --git a/vendor.prop b/vendor.prop index 94072b7..6d5eba8 100644 --- a/vendor.prop +++ b/vendor.prop @@ -173,8 +173,8 @@ persist.demo.hdmirotationlock=false persist.sys.sf.color_mode=0 persist.sys.sf.color_saturation=1.0 persist.sys.sf.native_mode=0 -ro.gfx.driver.0=com.oneplus.gpudrivers.kona.api30 -ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.kona.api30 +ro.gfx.driver.0=com.oneplus.gpudrivers.lahaina.api30 +ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.lahaina.api30 ro.hardware.egl=adreno ro.hardware.vulkan=adreno ro.opengles.version=196610 diff --git a/vibrator/Android.bp b/vibrator/Android.bp index d9e4a9d..c3425ac 100644 --- a/vibrator/Android.bp +++ b/vibrator/Android.bp @@ -2,7 +2,7 @@ Common_CFlags = ["-Wall"] Common_CFlags += ["-Werror"] cc_library_shared { - name: "vendor.qti.hardware.vibrator.impl.oneplus_kona", + name: "vendor.qti.hardware.vibrator.impl.oneplus_lahaina", stem: "vendor.qti.hardware.vibrator.impl", vendor: true, cflags: Common_CFlags, @@ -21,7 +21,7 @@ cc_library_shared { } cc_binary { - name: "vendor.qti.hardware.vibrator.service.oneplus_kona", + name: "vendor.qti.hardware.vibrator.service.oneplus_lahaina", stem: "vendor.qti.hardware.vibrator.service", vendor: true, relative_install_path: "hw", diff --git a/wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini b/wifi/qca6390/WCNSS_qcom_cfg_cta_lahaina_8.ini similarity index 100% rename from wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini rename to wifi/qca6390/WCNSS_qcom_cfg_cta_lahaina_8.ini