diff --git a/Android.bp b/Android.bp index f2c13a1..36547d5 100644 --- a/Android.bp +++ b/Android.bp @@ -32,16 +32,16 @@ cc_prebuilt_library_shared { }, target: { android_arm: { - srcs: ["proprietary/product/lib/vendor.qti.hardware.fm@1.0.so"], + srcs: ["proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so"], }, android_arm64: { - srcs: ["proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so"], + srcs: ["proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so"], }, }, compile_multilib: "both", check_elf_files: false, prefer: true, - product_specific: true, + system_ext_specific: true, } android_app_import { diff --git a/proprietary/system_ext/bin/wfdservice64 b/proprietary/system_ext/bin/wfdservice64 deleted file mode 100755 index 2f9f223..0000000 Binary files a/proprietary/system_ext/bin/wfdservice64 and /dev/null differ diff --git a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml b/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml deleted file mode 100644 index 47462f8..0000000 --- a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy deleted file mode 100644 index 98b3c11..0000000 --- a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc -# -# Not a contribution. -# -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE -mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE -munmap: 1 -futex: 1 -#prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE -prctl: 1 -#ioctl: arg1 == BINDER_VERSION || arg1 == BINDER_WRITE_READ || arg1 == BINDER_SET_MAX_THREADS -ioctl: 1 -close: 1 -openat: 1 -mremap: 1 -fstat: 1 -readlinkat: 1 -pread64: 1 -fstatfs: 1 -clock_gettime: 1 -fstatat: 1 -read: 1 -write: 1 -fcntl: 1 -ppoll: 1 -faccessat: 1 -rt_sigaction: 1 -getuid: 1 -madvise: 1 -rt_sigprocmask: 1 -writev: 1 -personality: 1 -getrandom: 1 -gettimeofday: 1 -#set_tls: 1 -statfs: 1 -ugetrlimit: 1 -getrlimit: 1 -execve: 1 -connect: 1 -socket: arg0 == AF_UNIX -getpid: 1 -gettid: 1 -nanosleep: 1 -restart_syscall: 1 -set_tid_address: 1 -open: 1 -exit: 1 -sched_getscheduler: 1 -exit_group: 1 -sigaltstack: 1 -clone: 1 -rt_sigreturn: 1 -setpriority: 1 -getpriority: 1 -timer_create: 1 -timer_delete: 1 -timer_settime: 1 -rt_sigtimedwait: 1 -getdents64: 1 -dup: 1 -lseek: 1 -tgkill: 1 -process_vm_readv: 1 -memfd_create: 1 -eventfd2: 1 -epoll_create1: 1 -epoll_ctl: 1 -recvfrom: 1 -epoll_pwait: 1 diff --git a/proprietary/lib/fm_helium.so b/proprietary/system_ext/lib/fm_helium.so similarity index 100% rename from proprietary/lib/fm_helium.so rename to proprietary/system_ext/lib/fm_helium.so diff --git a/proprietary/lib/libfm-hci.so b/proprietary/system_ext/lib/libfm-hci.so similarity index 100% rename from proprietary/lib/libfm-hci.so rename to proprietary/system_ext/lib/libfm-hci.so diff --git a/proprietary/system_ext/lib/libmiracastsystem.so b/proprietary/system_ext/lib/libmiracastsystem.so deleted file mode 100644 index 83e1e6d..0000000 Binary files a/proprietary/system_ext/lib/libmiracastsystem.so and /dev/null differ diff --git a/proprietary/product/lib/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so similarity index 100% rename from proprietary/product/lib/vendor.qti.hardware.fm@1.0.so rename to proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so b/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so deleted file mode 100644 index 084125b..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so and /dev/null differ diff --git a/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0.so b/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0.so deleted file mode 100644 index f0f7916..0000000 Binary files a/proprietary/system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.wifidisplayhal@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.wifidisplayhal@1.0.so deleted file mode 100644 index a641f7f..0000000 Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.wifidisplayhal@1.0.so and /dev/null differ diff --git a/proprietary/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so similarity index 100% rename from proprietary/lib64/fm_helium.so rename to proprietary/system_ext/lib64/fm_helium.so diff --git a/proprietary/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so similarity index 100% rename from proprietary/lib64/libfm-hci.so rename to proprietary/system_ext/lib64/libfm-hci.so diff --git a/proprietary/system_ext/lib64/libmiracastsystem.so b/proprietary/system_ext/lib64/libmiracastsystem.so deleted file mode 100644 index 65e90b5..0000000 Binary files a/proprietary/system_ext/lib64/libmiracastsystem.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so deleted file mode 100644 index 4a70088..0000000 Binary files a/proprietary/system_ext/lib64/libwfdavenhancements.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so deleted file mode 100644 index 2059410..0000000 Binary files a/proprietary/system_ext/lib64/libwfdmmsrc_system.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so deleted file mode 100644 index 6d98d57..0000000 Binary files a/proprietary/system_ext/lib64/libwfdservice.so and /dev/null differ diff --git a/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so similarity index 100% rename from proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so rename to proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so b/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so deleted file mode 100644 index e25e02c..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0-halimpl.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0.so deleted file mode 100644 index e962f5f..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0.so and /dev/null differ diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so deleted file mode 100644 index 7874cbd..0000000 Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so and /dev/null differ diff --git a/sdm710-common-vendor.mk b/sdm710-common-vendor.mk index d49e102..bef4733 100644 --- a/sdm710-common-vendor.mk +++ b/sdm710-common-vendor.mk @@ -6,12 +6,12 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/lenovo/sdm710-common PRODUCT_COPY_FILES += \ - vendor/lenovo/sdm710-common/proprietary/lib/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM)/lib/fm_helium.so \ - vendor/lenovo/sdm710-common/proprietary/lib/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libfm-hci.so \ - vendor/lenovo/sdm710-common/proprietary/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/fm_helium.so \ - vendor/lenovo/sdm710-common/proprietary/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libfm-hci.so \ vendor/lenovo/sdm710-common/proprietary/product/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/com.qualcomm.qti.ant@1.0.so \ vendor/lenovo/sdm710-common/proprietary/product/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.qualcomm.qti.ant@1.0.so \ + vendor/lenovo/sdm710-common/proprietary/system_ext/lib/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/fm_helium.so \ + vendor/lenovo/sdm710-common/proprietary/system_ext/lib/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libfm-hci.so \ + vendor/lenovo/sdm710-common/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \ + vendor/lenovo/sdm710-common/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \ vendor/lenovo/sdm710-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ vendor/lenovo/sdm710-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \ vendor/lenovo/sdm710-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \