Commit 30efe719 authored by Blaster4385's avatar Blaster4385
Browse files

nicky: sync with dt 

- Switch some stuff to qti common components
parent ea40d477

Android.bp

+0 −18
Original line number Diff line number Diff line
@@ -186,24 +186,6 @@ android_app_import { 
	product_specific: true,

}



android_app_import {

	name: "WfdService",

	owner: "oplus",

	apk: "proprietary/system_ext/priv-app/WfdService/WfdService.apk",

	certificate: "platform",

	dex_preopt: {

		enabled: false,

	},

	privileged: true,

	system_ext_specific: true,

}



dex_import {

	name: "WfdCommon",

	owner: "oplus",

	jars: ["proprietary/framework/WfdCommon.jar"],

}



dex_import {

	name: "vendor.qti.hardware.alarm-V1.0-java",

	owner: "oplus",

nicky-vendor.mk

+9 −56
Original line number Diff line number Diff line
@@ -71,15 +71,6 @@ PRODUCT_COPY_FILES += \ 
    vendor/oplus/nicky/proprietary/odm/lib64/vendor.oplus.hardware.ims@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.ims@1.0.so \

    vendor/oplus/nicky/proprietary/odm/lib64/vendor.oplus.hardware.orms@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.orms@1.0.so \

    vendor/oplus/nicky/proprietary/odm/lib64/vendor.oplus.hardware.radio@1.0.so:$(TARGET_COPY_OUT_ODM)/lib64/vendor.oplus.hardware.radio@1.0.so \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b00:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b00 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b01:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b01 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b02:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b02 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b03:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b03 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b04:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b04 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b05:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b05 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b06:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b06 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b07:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b07 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.mdt:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.mdt \

    vendor/oplus/nicky/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \

    vendor/oplus/nicky/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \

    vendor/oplus/nicky/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
@@ -1148,6 +1139,15 @@ PRODUCT_PACKAGES += \ 
    manifest_android.hardware.drm@1.3-service.widevine \

    vendor.qti.gnss@4.0-service

PRODUCT_COPY_FILES += \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b00:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b00 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b01:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b01 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b02:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b02 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b03:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b03 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b04:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b04 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b05:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b05 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b06:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b06 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.b07:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.b07 \

    vendor/oplus/nicky/proprietary/odm/vendor/firmware/a_fp.mdt:$(TARGET_COPY_OUT_ODM)/vendor/firmware/a_fp.mdt \

    vendor/oplus/nicky/proprietary/vendor/18621/lib/camera/com.qti.sensormodule.ofilm_gc5035.bin:$(TARGET_COPY_OUT_VENDOR)/18621/lib/camera/com.qti.sensormodule.ofilm_gc5035.bin \

    vendor/oplus/nicky/proprietary/vendor/18621/lib/camera/com.qti.sensormodule.ofilm_imx519.bin:$(TARGET_COPY_OUT_VENDOR)/18621/lib/camera/com.qti.sensormodule.ofilm_imx519.bin \

    vendor/oplus/nicky/proprietary/vendor/18621/lib/camera/com.qti.sensormodule.truly_s5k2x5.bin:$(TARGET_COPY_OUT_VENDOR)/18621/lib/camera/com.qti.sensormodule.truly_s5k2x5.bin \
@@ -1310,52 +1310,7 @@ PRODUCT_COPY_FILES += \ 
    vendor/oplus/nicky/proprietary/vendor/19651/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/19651/lib64/hw/com.qti.chi.override.so \

    vendor/oplus/nicky/proprietary/vendor/19651/lib64/libarcsoft_low_light_hdr.so:$(TARGET_COPY_OUT_VENDOR)/19651/lib64/libarcsoft_low_light_hdr.so

PRODUCT_COPY_FILES += \

    vendor/oplus/nicky/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \

    vendor/oplus/nicky/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \

    vendor/oplus/nicky/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \

    vendor/oplus/nicky/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \

    vendor/oplus/nicky/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \

    vendor/oplus/nicky/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpdecoder.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmrtpencoder.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdavenhancements.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdclient.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdcommonutils.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdconfigutils.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfddisplayconfig.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmminterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsink.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdmmsrc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdmmsrc_system.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdrtsp.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdservice.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfdsinksm.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsink.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsinkinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.alarm@1.0.so \

    vendor/oplus/nicky/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdclient.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdcommonutils.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdconfigutils.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfddisplayconfig.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmminterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdmmsink.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdnative.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdrtsp.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfdsinksm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfdsinksm.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsink.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsinkinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrc.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libwfduibcsrcinterface.so \

    vendor/oplus/nicky/proprietary/system_ext/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.alarm@1.0.so \

    vendor/oplus/nicky/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \

    vendor/oplus/nicky/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
@@ -1568,6 +1523,4 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_PACKAGES += \

    TimeService \

    PowerOffAlarm \

    WfdService \

    WfdCommon \

    vendor.qti.hardware.alarm-V1.0-java

proprietary/system_ext/bin/wfdservice

deleted100755 → 0
−5.7 KiB

File deleted.

View file

proprietary/system_ext/etc/init/wfdservice.rc

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#

# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.

# All Rights Reserved.

# Confidential and Proprietary - Qualcomm Technologies, Inc.

#

service wfdservice /system_ext/bin/wfdservice

    class main

    user system

    disabled

    oneshot



on property:vendor.wfdservice=enable

    start wfdservice



on property:vendor.wfdservice=disable

    stop wfdservice

proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<!--

  Copyright (c) 2020 Qualcomm Technologies, Inc.

  All Rights Reserved.

  Confidential and Proprietary - Qualcomm Technologies, Inc.

-->

<permissions>

    <privapp-permissions package="com.qualcomm.wfd.service">

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

    </privapp-permissions>

</permissions>