BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8350-common: Initial common device tree conversion

Browse source 
Change-Id: I0d7188b3fa82dddf3f9fb9523d716a8f15f46184
This commit is contained in:
Bruno Martins 2021-05-25 17:54:59 +01:00 committed by LuK1337
parent 2bee5a8ca6
commit 410e7ff323
39 changed files with 85 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Android.mk
View file

@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir) 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)) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))

24
BoardConfigCommon.mk
View file

@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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 BOARD_VENDOR := oneplus
COMMON_PATH := device/oneplus/sm8250-common COMMON_PATH := device/oneplus/sm8350-common
# Architecture # Architecture
TARGET_ARCH := arm64 TARGET_ARCH := arm64
@ -38,7 +38,7 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
# Bootloader # Bootloader
TARGET_BOOTLOADER_BOARD_NAME := kona TARGET_BOOTLOADER_BOARD_NAME := lahaina
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
# Kernel # Kernel
@ -50,14 +50,14 @@ BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_SEPARATED_DTBO := true BOARD_KERNEL_SEPARATED_DTBO := true
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) 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_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_CLANG_COMPILE := true
TARGET_KERNEL_CONFIG := vendor/kona-perf_defconfig TARGET_KERNEL_CONFIG := vendor/lahaina-qgki_defconfig
# Platform # Platform
BOARD_USES_QCOM_HARDWARE := true BOARD_USES_QCOM_HARDWARE := true
TARGET_BOARD_PLATFORM := kona TARGET_BOARD_PLATFORM := lahaina
TARGET_BOARD_PLATFORM_GPU := qcom-adreno650 TARGET_BOARD_PLATFORM_GPU := qcom-adreno660
# Properties # Properties
TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop TARGET_ODM_PROP += $(COMMON_PATH)/odm.prop
@ -123,9 +123,9 @@ TARGET_ENABLE_MEDIADRM_64 := true
TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
# Fingerprint # Fingerprint
SOONG_CONFIG_NAMESPACES += ONEPLUS_KONA_FOD SOONG_CONFIG_NAMESPACES += ONEPLUS_LAHAINA_FOD
SOONG_CONFIG_ONEPLUS_KONA_FOD := POS_X POS_Y SIZE SOONG_CONFIG_ONEPLUS_LAHAINA_FOD := POS_X POS_Y SIZE
TARGET_SURFACEFLINGER_FOD_LIB := //$(COMMON_PATH):libfod_extension.oneplus_kona TARGET_SURFACEFLINGER_FOD_LIB := //$(COMMON_PATH):libfod_extension.oneplus_lahaina
# HIDL # HIDL
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/device_framework_matrix.xml 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 WPA_SUPPLICANT_VERSION := VER_0_8_X
# Inherit from the proprietary version # Inherit from the proprietary version
-include vendor/oneplus/sm8250-common/BoardConfigVendor.mk -include vendor/oneplus/sm8350-common/BoardConfigVendor.mk

6
bootctrl/Android.bp
View file

@ -15,14 +15,14 @@
// //
cc_library { cc_library {
name: "bootctrl.kona", name: "bootctrl.lahaina",
defaults: ["bootctrl_hal_defaults"], defaults: ["bootctrl_hal_defaults"],
static_libs: ["libgptutils.oneplus_kona"], static_libs: ["libgptutils.oneplus_lahaina"],
} }
cc_library_shared { cc_library_shared {
name: "android.hardware.boot@1.1-impl-qti", name: "android.hardware.boot@1.1-impl-qti",
stem: "android.hardware.boot@1.0-impl-1.1-qti", stem: "android.hardware.boot@1.0-impl-1.1-qti",
defaults: ["android.hardware.boot@1.1-impl-qti_defaults"], defaults: ["android.hardware.boot@1.1-impl-qti_defaults"],
static_libs: ["libgptutils.oneplus_kona"], static_libs: ["libgptutils.oneplus_lahaina"],
} }

38
common.mk
View file

@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
# Get non-open-source specific aspects # 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 # Additional native libraries
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -122,10 +122,10 @@ PRODUCT_PACKAGES += \
android.hardware.soundtrigger@2.3-impl \ android.hardware.soundtrigger@2.3-impl \
audio.a2dp.default \ audio.a2dp.default \
audio.bluetooth.default \ audio.bluetooth.default \
audio.primary.kona \ audio.primary.lahaina \
audio.r_submix.default \ audio.r_submix.default \
audio.usb.default \ audio.usb.default \
audio_amplifier.kona \ audio_amplifier.lahaina \
liba2dpoffload \ liba2dpoffload \
libaudiopreprocessing \ libaudiopreprocessing \
libbatterylistener \ libbatterylistener \
@ -175,8 +175,8 @@ PRODUCT_PACKAGES += \
android.hardware.boot@1.1-impl-qti \ android.hardware.boot@1.1-impl-qti \
android.hardware.boot@1.1-impl-qti.recovery \ android.hardware.boot@1.1-impl-qti.recovery \
android.hardware.boot@1.1-service \ android.hardware.boot@1.1-service \
bootctrl.kona \ bootctrl.lahaina \
bootctrl.kona.recovery bootctrl.lahaina.recovery
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
bootctl bootctl
@ -232,7 +232,7 @@ PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@4.0-impl-qti-display \ android.hardware.graphics.mapper@4.0-impl-qti-display \
android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-impl \
android.hardware.memtrack@1.0-service \ android.hardware.memtrack@1.0-service \
gralloc.kona \ gralloc.lahaina \
libdisplayconfig.qti \ libdisplayconfig.qti \
libdisplayconfig.qti.vendor \ libdisplayconfig.qti.vendor \
libqdMetaData \ libqdMetaData \
@ -240,7 +240,7 @@ PRODUCT_PACKAGES += \
libsdmutils \ libsdmutils \
libtinyxml \ libtinyxml \
libvulkan \ libvulkan \
memtrack.kona \ memtrack.lahaina \
vendor.display.config@1.0 \ vendor.display.config@1.0 \
vendor.display.config@1.0.vendor \ vendor.display.config@1.0.vendor \
vendor.display.config@1.1.vendor \ vendor.display.config@1.1.vendor \
@ -277,8 +277,8 @@ PRODUCT_PACKAGES += \
# Fingerprint # Fingerprint
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona \ android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina \
vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona \ vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina \
vendor.oneplus.fingerprint.extension@1.0 \ vendor.oneplus.fingerprint.extension@1.0 \
vendor.oneplus.hardware.display@1.0 vendor.oneplus.hardware.display@1.0
@ -319,19 +319,19 @@ PRODUCT_PACKAGES += \
# LiveDisplay # LiveDisplay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vendor.lineage.livedisplay@2.1-service.oneplus_kona vendor.lineage.livedisplay@2.1-service.oneplus_lahaina
# Media # Media
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(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_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.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.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_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.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_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 $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
@ -381,10 +381,10 @@ PRODUCT_PACKAGES += \
# OnePlus # OnePlus
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
oneplus-fwk.oneplus_kona oneplus-fwk.oneplus_lahaina
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
oneplus-fwk.oneplus_kona oneplus-fwk.oneplus_lahaina
# Power # Power
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -437,7 +437,7 @@ PRODUCT_COPY_FILES += \
# Touch # Touch
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vendor.lineage.touch@1.0-service.oneplus_kona vendor.lineage.touch@1.0-service.oneplus_lahaina
# tri-state-key # tri-state-key
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -471,7 +471,7 @@ PRODUCT_PACKAGES += \
# Vibrator # Vibrator
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
vendor.qti.hardware.vibrator.service.oneplus_kona vendor.qti.hardware.vibrator.service.oneplus_lahaina
# Seccomp policy # Seccomp policy
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -495,7 +495,7 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \ 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.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_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/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 \ $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \

0
configs/media_codecs_kona.xml → configs/media_codecs_lahaina.xml
View file

0
configs/media_codecs_performance_kona.xml → configs/media_codecs_performance_lahaina.xml
View file

0
configs/media_profiles_kona.xml → configs/media_profiles_lahaina.xml
View file

6
fingerprint/Android.bp
View file

@ -1,8 +1,8 @@
cc_binary { 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"], defaults: ["hidl_defaults"],
init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc"], init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc"],
vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml"], vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml"],
vendor: true, vendor: true,
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

2
fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.rc → fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.rc
View file

@ -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 # "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 # in /data. As a workaround, postpone startup until later in boot once
# /data is mounted. # /data is mounted.

0
fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_kona.xml → fingerprint/android.hardware.biometrics.fingerprint@2.1-service.oneplus_lahaina.xml
View file

10
fod/Android.bp
View file

@ -13,12 +13,12 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
oneplus_kona_fod_hal_binary { oneplus_lahaina_fod_hal_binary {
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona", name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina",
init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc"],
vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml"], vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml"],
srcs: ["service.cpp", "FingerprintInscreen.cpp"], srcs: ["service.cpp", "FingerprintInscreen.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",
@ -34,7 +34,7 @@ oneplus_kona_fod_hal_binary {
} }
cc_library_static { cc_library_static {
name: "libfod_extension.oneplus_kona", name: "libfod_extension.oneplus_lahaina",
srcs: ["FodExtension.cpp"], srcs: ["FodExtension.cpp"],
include_dirs: [ include_dirs: [
"frameworks/native/services/surfaceflinger/CompositionEngine/include" "frameworks/native/services/surfaceflinger/CompositionEngine/include"

2
fod/service.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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 <android-base/logging.h> #include <android-base/logging.h>
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>

2
fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc → fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.rc
View file

@ -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 interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default
class hal class hal
user system user system

0
fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml → fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_lahaina.xml
View file

2
gpt-utils/Android.bp
View file

@ -16,7 +16,7 @@
cc_library { cc_library {
name: "libgptutils.oneplus_kona", name: "libgptutils.oneplus_lahaina",
vendor: true, vendor: true,
recovery_available: true, recovery_available: true,
shared_libs: [ shared_libs: [

4
lineage.dependencies
View file

@ -4,7 +4,7 @@
"target_path": "device/oneplus/common" "target_path": "device/oneplus/common"
}, },
{ {
"repository": "android_kernel_oneplus_sm8250", "repository": "android_kernel_oneplus_sm8350",
"target_path": "kernel/oneplus/sm8250" "target_path": "kernel/oneplus/sm8350"
} }
] ]

6
livedisplay/Android.bp
View file

@ -14,9 +14,9 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "vendor.lineage.livedisplay@2.1-service.oneplus_kona", name: "vendor.lineage.livedisplay@2.1-service.oneplus_lahaina",
init_rc: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc"],
vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml"], vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

2
livedisplay/service.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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 <android-base/logging.h> #include <android-base/logging.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>

2
livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.rc → livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.rc
View file

@ -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/dimlayer_bl_en
chmod 0666 /sys/class/drm/card0-DSI-1/hbm 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 class hal
user system user system
group system group system

0
livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_kona.xml → livedisplay/vendor.lineage.livedisplay@2.1-service.oneplus_lahaina.xml
View file

2
oneplus-fwk/Android.bp
View file

@ -1,5 +1,5 @@
java_library { java_library {
name: "oneplus-fwk.oneplus_kona", name: "oneplus-fwk.oneplus_lahaina",
installable: true, installable: true,
srcs: [ srcs: [

6
powershare/Android.bp
View file

@ -16,9 +16,9 @@
cc_binary { cc_binary {
relative_install_path: "hw", relative_install_path: "hw",
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
name: "vendor.lineage.powershare@1.0-service.oneplus_kona", name: "vendor.lineage.powershare@1.0-service.oneplus_lahaina",
init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc"],
vintf_fragments: ["vendor.lineage.powershare@1.0-service.oneplus_kona.xml"], vintf_fragments: ["vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml"],
srcs: ["service.cpp", "PowerShare.cpp"], srcs: ["service.cpp", "PowerShare.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",

2
powershare/service.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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 <android-base/logging.h> #include <android-base/logging.h>
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>

2
powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.rc → powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.rc
View file

@ -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 class hal
user system user system
group system group system

0
powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml → powershare/vendor.lineage.powershare@1.0-service.oneplus_lahaina.xml
View file

7
rootdir/etc/init.target.rc
View file

@ -279,11 +279,8 @@ service dcvs-sh /vendor/bin/init.qti.dcvs.sh
on property:vendor.dcvs.prop=1 on property:vendor.dcvs.prop=1
start dcvs-sh start dcvs-sh
on property:ro.boot.project_codename=instantnoodle on property:ro.boot.project_codename=lemonade
setprop persist.radio.multisim.config dsds setprop persist.radio.multisim.config dsds
on property:ro.boot.project_codename=instantnoodlep on property:ro.boot.project_codename=lemonadep
setprop persist.radio.multisim.config dsds
on property:ro.boot.project_codename=kebab
setprop persist.radio.multisim.config dsds setprop persist.radio.multisim.config dsds

10
sepolicy/vendor/file_contexts vendored
View file

@ -48,11 +48,11 @@
/dev/wlchg u:object_r:wlchg_device:s0 /dev/wlchg u:object_r:wlchg_device:s0
# HALs # 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/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_kona u:object_r:hal_lineage_fod_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_kona u:object_r:hal_lineage_livedisplay_qti_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_kona u:object_r:hal_lineage_powershare_default_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_kona u:object_r:hal_lineage_touch_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\.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\.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 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.display@1\.0-service u:object_r:hal_display_default_exec:s0

2
setup-makefiles.sh
View file

@ -25,7 +25,7 @@ source "${HELPER}"
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
# Warning headers and guards # Warning headers and guards
write_headers "instantnoodle instantnoodlep kebab" write_headers "lemonade lemonadep"
# The standard common blobs # The standard common blobs
write_makefiles "${MY_DIR}/proprietary-files.txt" true write_makefiles "${MY_DIR}/proprietary-files.txt" true

4
soong/Android.bp
View file

@ -1,6 +1,6 @@
bootstrap_go_package { bootstrap_go_package {
name: "soong-oneplus-kona-plugins", name: "soong-oneplus-lahaina-plugins",
pkgPath: "device/oneplus/sm8250-common", pkgPath: "device/oneplus/sm8350-common",
deps: [ deps: [
"blueprint", "blueprint",
"blueprint-pathtools", "blueprint-pathtools",

4
soong/fod.go
View file

@ -1,4 +1,4 @@
package kona package lahaina
import ( import (
"android/soong/android" "android/soong/android"
@ -9,7 +9,7 @@ import (
func fodFlags(ctx android.BaseContext) []string { func fodFlags(ctx android.BaseContext) []string {
var cflags []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 posX = strings.TrimSpace(config.String("POS_X"))
var posY = strings.TrimSpace(config.String("POS_Y")) var posY = strings.TrimSpace(config.String("POS_Y"))
var size = strings.TrimSpace(config.String("SIZE")) var size = strings.TrimSpace(config.String("SIZE"))

4
soong/main.go
View file

@ -1,9 +1,9 @@
package kona package lahaina
import ( import (
"android/soong/android" "android/soong/android"
) )
func init() { func init() {
android.RegisterModuleType("oneplus_kona_fod_hal_binary", fodHalBinaryFactory) android.RegisterModuleType("oneplus_lahaina_fod_hal_binary", fodHalBinaryFactory)
} }

2
system.prop
View file

@ -34,7 +34,7 @@ vendor.iop.enable_uxe=0
media.settings.xml=/vendor/etc/media_profiles_vendor.xml media.settings.xml=/vendor/etc/media_profiles_vendor.xml
# Netflix # Netflix
ro.netflix.bsp_rev=Q8250-19134-1 ro.netflix.bsp_rev=Q875-32408-1
# Perf # Perf
ro.vendor.qti.core_ctl_max_cpu=4 ro.vendor.qti.core_ctl_max_cpu=4

6
touch/Android.bp
View file

@ -14,9 +14,9 @@
// limitations under the License. // limitations under the License.
cc_binary { cc_binary {
name: "vendor.lineage.touch@1.0-service.oneplus_kona", name: "vendor.lineage.touch@1.0-service.oneplus_lahaina",
init_rc: ["vendor.lineage.touch@1.0-service.oneplus_kona.rc"], init_rc: ["vendor.lineage.touch@1.0-service.oneplus_lahaina.rc"],
vintf_fragments: ["vendor.lineage.touch@1.0-service.oneplus_kona.xml"], vintf_fragments: ["vendor.lineage.touch@1.0-service.oneplus_lahaina.xml"],
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

2
touch/service.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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 <android-base/logging.h> #include <android-base/logging.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>

2
touch/vendor.lineage.touch@1.0-service.oneplus_kona.rc → touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.rc
View file

@ -18,7 +18,7 @@ on boot
chown system system /proc/touchpanel/right_arrow_enable chown system system /proc/touchpanel/right_arrow_enable
chown system system /proc/touchpanel/single_tap_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 class hal
user system user system
group system group system

0
touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml → touch/vendor.lineage.touch@1.0-service.oneplus_lahaina.xml
View file

4
vendor.prop
View file

@ -173,8 +173,8 @@ persist.demo.hdmirotationlock=false
persist.sys.sf.color_mode=0 persist.sys.sf.color_mode=0
persist.sys.sf.color_saturation=1.0 persist.sys.sf.color_saturation=1.0
persist.sys.sf.native_mode=0 persist.sys.sf.native_mode=0
ro.gfx.driver.0=com.oneplus.gpudrivers.kona.api30 ro.gfx.driver.0=com.oneplus.gpudrivers.lahaina.api30
ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.kona.api30 ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.lahaina.api30
ro.hardware.egl=adreno ro.hardware.egl=adreno
ro.hardware.vulkan=adreno ro.hardware.vulkan=adreno
ro.opengles.version=196610 ro.opengles.version=196610

4
vibrator/Android.bp
View file

@ -2,7 +2,7 @@ Common_CFlags = ["-Wall"]
Common_CFlags += ["-Werror"] Common_CFlags += ["-Werror"]
cc_library_shared { 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", stem: "vendor.qti.hardware.vibrator.impl",
vendor: true, vendor: true,
cflags: Common_CFlags, cflags: Common_CFlags,
@ -21,7 +21,7 @@ cc_library_shared {
} }
cc_binary { cc_binary {
name: "vendor.qti.hardware.vibrator.service.oneplus_kona", name: "vendor.qti.hardware.vibrator.service.oneplus_lahaina",
stem: "vendor.qti.hardware.vibrator.service", stem: "vendor.qti.hardware.vibrator.service",
vendor: true, vendor: true,
relative_install_path: "hw", relative_install_path: "hw",

0
wifi/qca6390/WCNSS_qcom_cfg_cta_kona_8.ini → wifi/qca6390/WCNSS_qcom_cfg_cta_lahaina_8.ini
View file