Commit 8dc02a00 authored by Blaster4385's avatar Blaster4385
Browse files

nicky: Initial CAF bringup 

- Switch most stuff to common qti components
- Set correct kernel flags
parent 8a476f88

BoardConfig.mk

+6 −14
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ TARGET_2ND_CPU_VARIANT := generic 
TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385



# Audio

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

BOARD_USES_ALSA_AUDIO := true

USE_CUSTOM_AUDIO_POLICY := 1



# Bluetooth
@@ -65,13 +57,12 @@ BOARD_KERNEL_BASE := 0x00000000 
BOARD_KERNEL_PAGESIZE := 4096

BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xA90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3 swiotlb=1 loop.max_part=7

BOARD_KERNEL_CMDLINE += androidboot.init_fatal_reboot_target=recovery

BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive

BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb

BOARD_KERNEL_SEPARATED_DTBO := true

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

TARGET_KERNEL_SOURCE := kernel/oplus/sdm710

TARGET_KERNEL_CONFIG := sdm670-perf_defconfig

TARGET_KERNEL_CLANG_COMPILE := true

#TARGET_KERNEL_CLANG_VERSION := proton

KERNEL_DEFCONFIG := sdm670-perf_defconfig

KERNEL_CUSTOM_LLVM := true



# Partitions

BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
@@ -100,7 +91,6 @@ TARGET_BOARD_PLATFORM := sdm710 
TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable"



# Properties

TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop

TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop

TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
@@ -121,7 +111,6 @@ ENABLE_VENDOR_RIL_SERVICE := true 
VENDOR_SECURITY_PATCH := 2022-04-05



# Sepolicy

include device/qcom/sepolicy_vndr/SEPolicy.mk

BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor

SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private

SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
@@ -137,6 +126,9 @@ BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1 
BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1



# VINTF

DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \

    $(DEVICE_PATH)/device_framework_matrix.xml \

    vendor/qcom/opensource/core-utils/vendor_framework_compatibility_matrix.xml

DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml

DEVICE_MATRIX_FILE += $(DEVICE_PATH)/compatibility_matrix.xml

ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml

device.mk

+18 −114
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)



# Include GSI keys

$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)

#$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)



# Setup dalvik vm configs

$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
@@ -28,8 +28,6 @@ PRODUCT_SHIPPING_API_LEVEL := 28 
PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \

    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \

    frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \

    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \

    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \

    frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \

    frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
@@ -50,8 +48,6 @@ PRODUCT_COPY_FILES += \ 
    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \

    frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml \

    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

    frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \

    frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \

    frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute-0.xml \

    frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level-1.xml \

    frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_1.xml \
@@ -68,60 +64,9 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COMPRESSED_APEX := false



# Audio

PRODUCT_PACKAGES += \

    android.hardware.audio@6.0-impl \

    android.hardware.audio.effect@6.0-impl \

    android.hardware.audio.service \

    android.hardware.bluetooth.audio@2.1-impl \

    android.hardware.soundtrigger@2.1-impl \

    audio.a2dp.default \

    audio.bluetooth.default \

    audio.primary.sdm710 \

    audio.r_submix.default \

    audio.usb.default \

    audioadsprpcd \

    liba2dpoffload \

    libbatterylistener \

    libcomprcapture \

    libexthwplugin \

    libhdmiedid \

    libhfp \

    libqcompostprocbundle \

    libqcomvisualizer \

    libqcomvoiceprocessing \

    libsndmonitor \

    libspkrprot \

    libssrec \

    libstdc++.vendor \

    libtinycompress \

    libtinymix \

    libvolumelistener



# Audio configs

AUDIO_HAL_DIR := hardware/qcom-caf/sm8350/audio



PRODUCT_COPY_FILES += \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \

    $(AUDIO_HAL_DIR)/configs/common/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml



PRODUCT_COPY_FILES += \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \

    $(AUDIO_HAL_DIR)/configs/sdm710/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \

    $(AUDIO_HAL_DIR)/configs/sdm710/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml



PRODUCT_COPY_FILES += \

    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/,$(TARGET_COPY_OUT_VENDOR)/etc)



PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \

    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \

    frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml



# Bluetooth

PRODUCT_PACKAGES += \

    android.hardware.bluetooth@1.1.vendor \
@@ -262,16 +207,6 @@ PRODUCT_PACKAGES += \ 
    libavservices_minijail.vendor \

    libavservices_minijail_vendor



# Media configs

PRODUCT_COPY_FILES += \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml



# Net

PRODUCT_PACKAGES += \

    android.system.net.netd@1.1.vendor
@@ -283,18 +218,6 @@ PRODUCT_PACKAGES += \ 
# NFC/Secure Element

PRODUCT_PACKAGES += android.hardware.secure_element@1.2.vendor



# OMX

PRODUCT_PACKAGES += \

    libOmxAacEnc \

    libOmxAmrEnc \

    libOmxCore \

    libOmxEvrcEnc \

    libOmxG711Enc \

    libOmxQcelp13Enc \

    libOmxVdec \

    libOmxVenc \

    libstagefrighthw



# Overlays

DEVICE_PACKAGE_OVERLAYS += \

    $(LOCAL_PATH)/overlay \
@@ -309,10 +232,6 @@ PRODUCT_PACKAGES += \ 
    SystemUIResTarget_oled \

    SystemUIResTarget_lcd



# Perf

PRODUCT_PACKAGES += \

    libqti-perfd-client



# Power

PRODUCT_PACKAGES += \

    android.hardware.power-service \
@@ -331,6 +250,19 @@ PRODUCT_PACKAGES += \ 
    libvndfwk_detect_jni.qti \

    libvndfwk_detect_jni.qti.vendor



# QTI

TARGET_BOARD_PLATFORM := sdm710

TARGET_KERNEL_VERSION := 4.9



TARGET_COMMON_QTI_COMPONENTS := \

    audio \

    av \

    bt \

    media-legacy \

    perf \

    usb \

    wfd



# Recovery

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/unified_script.sh:install/bin/unified_script.sh
@@ -357,19 +289,6 @@ PRODUCT_SOONG_NAMESPACES += \ 
    $(LOCAL_PATH) \

    hardware/oplus



# Telephony

PRODUCT_PACKAGES += \

    ims-ext-common \

    ims_ext_common.xml \

    qti-telephony-hidl-wrapper \

    qti_telephony_hidl_wrapper.xml \

    qti-telephony-utils \

    qti_telephony_utils.xml \

    telephony-ext



PRODUCT_BOOT_JARS += \

    telephony-ext



# Thermal

PRODUCT_PACKAGES += \

    android.hardware.thermal@2.0-service.qti
@@ -382,17 +301,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    vendor.lineage.trust@1.0-service



# USB

PRODUCT_PACKAGES += \

    android.hardware.usb@1.0-service



PRODUCT_PACKAGES += \

    init.qcom.usb.rc \

    init.qcom.usb.sh



PRODUCT_SOONG_NAMESPACES += \

    vendor/qcom/opensource/usb/etc



# Vibrator

PRODUCT_PACKAGES += \

    vendor.qti.hardware.vibrator.service \
@@ -413,18 +321,14 @@ PRODUCT_PACKAGES += \ 
    wpa_supplicant \

    wpa_supplicant.conf



PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \

    $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \

    $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf



# Wi-Fi Display

PRODUCT_PACKAGES += \

    libnl \

    libwfdaac_vendor



PRODUCT_BOOT_JARS += \

    WfdCommon

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \

    $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \

    $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf



# Inherit the proprietary files

$(call inherit-product, vendor/oplus/nicky/nicky-vendor.mk)

device_framework_matrix.xml

0 → 100644
+77 −0
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<hal format="hidl" optional="true">

    <name>com.qualcomm.qti.bluetooth_audio</name>

    <version>1.0</version>

    <interface>

        <name>IBluetoothAudio</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="aidl" optional="true">

    <name>vendor.aospa.power</name>

    <interface>

        <name>IPowerFeature</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.goodix.hardware.biometrics.fingerprint</name>

    <version>2.0-1</version>

    <interface>

        <name>IGoodixFingerprintDaemon</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.lineage.livedisplay</name>

    <version>2.0-1</version>

    <interface>

        <name>IPictureAdjustment</name>

        <instance>default</instance>

    </interface>

    <interface>

        <name>IAntiFlicker</name>

        <instance>default</instance>

    </interface>

    <interface>

        <name>ISunlightEnhancement</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.lineage.touch</name>

    <version>1.0</version>

    <interface>

        <name>IHighTouchPollingRate</name>

        <instance>default</instance>

    </interface>

    <interface>

        <name>ITouchscreenGesture</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.nxp.nxpnfc</name>

    <version>1.0</version>

    <interface>

        <name>INxpNfc</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.oplus.hardware.biometrics.fingerprint</name>

    <version>2.0-1</version>

    <interface>

        <name>IBiometricsFingerprint</name>

        <instance>default</instance>

    </interface>

</hal>

<hal format="hidl" optional="true">

    <name>vendor.qti.hardware.display.mapper</name>

    <version>1.0-1</version>

    <interface>

        <name>IQtiMapper</name>

        <instance>default</instance>

    </interface>

</hal>

</compatibility-matrix>
 
 No newline at end of file

libhidl/Android.bp

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
//

// Copyright (C) 2022 The LineageOS Project

//

// SPDX-License-Identifier: Apache-2.0

//



cc_library_shared {

    name: "android.hidl.base@1.0",

    shared_libs: ["libhidlbase"],

    system_ext_specific: true,

    vendor_available: true,

}

light/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ cc_binary { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "android.hardware.light-V1-ndk_platform",

        "android.hardware.light-V1-ndk",

    ],

    vendor: true,

}