sm6150-common: Move to 64bit wfdservice

Change-Id: I09e2db757334223fbc8be045177400f0bb9d53a4
Signed-off-by: donjohanliebert <donjohanliebert@gmail.com>

proprietary/system_ext/etc/init/wfdservice.rc

@@ -16,13 +16,13 @@ service wfdservice64 /system_ext/bin/wfdservice64
     oneshot
 
 on property:vendor.wfdservice=enable
-    start wfdservice
+    start wfdservice64
 
 on property:vendor.wfdservice64=enable
     start wfdservice64
 
 on property:vendor.wfdservice=disable
-    stop wfdservice
+    stop wfdservice64
 
 on property:vendor.wfdservice64=disable
     stop wfdservice64

proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
+# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc
 #
@@ -18,7 +18,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
 mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
 munmap: 1
 futex: 1
@@ -29,19 +29,19 @@ ioctl: 1
 close: 1
 openat: 1
 mremap: 1
-fstat64: 1
+fstat: 1
 readlinkat: 1
 pread64: 1
-fstatfs64: 1
+fstatfs: 1
 clock_gettime: 1
-fstatat64: 1
+fstatat: 1
 read: 1
 write: 1
-fcntl64: 1
+fcntl: 1
 ppoll: 1
 faccessat: 1
 rt_sigaction: 1
-getuid32: 1
+getuid: 1
 madvise: 1
 rt_sigprocmask: 1
 writev: 1
@@ -49,8 +49,9 @@ personality: 1
 getrandom: 1
 gettimeofday: 1
 #set_tls: 1
-statfs64: 1
+statfs: 1
 ugetrlimit: 1
+getrlimit: 1
 execve: 1
 connect: 1
 socket: arg0 == AF_UNIX
@@ -76,3 +77,10 @@ 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

sm6150-common-vendor.mk

@@ -15,7 +15,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm6150-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/xiaomi/sm6150-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
     vendor/xiaomi/sm6150-common/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/xiaomi/sm6150-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \
+    vendor/xiaomi/sm6150-common/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \
     vendor/xiaomi/sm6150-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/xiaomi/sm6150-common/proprietary/vendor/etc/cne/mwqem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/mwqem.conf \
     vendor/xiaomi/sm6150-common/proprietary/vendor/etc/cne/profileMwqem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/profileMwqem.xml \
@@ -383,26 +383,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.imsrtpservice@3.0_vendor \
     vendor.qti.latency@2.0 \
     vendor.qti.latency@2.1 \
-    libmmosal \
-    libmmparser_lite \
-    libmmrtpdecoder \
-    libmmrtpencoder \
-    libwfdcommonutils \
-    libwfdconfigutils \
-    libwfddisplayconfig \
-    libwfdmminterface \
-    libwfdmmsink \
-    libwfdrtsp \
-    libwfdsinksm \
-    libwfduibcinterface \
-    libwfduibcsink \
-    libwfduibcsinkinterface \
-    libwfduibcsrc \
-    libwfduibcsrcinterface \
-    libwfdavenhancements \
-    libwfdmmsrc_system \
-    libwfdservice \
-    vendor.qti.hardware.wifidisplaysession@1.0 \
     com.qualcomm.qti.dpm.api@1.0 \
     fm_helium \
     lib-imsvideocodec \
@@ -417,10 +397,30 @@ PRODUCT_PACKAGES += \
     libfm-hci \
     libimscamera_jni \
     libimsmedia_jni \
+    libmmosal \
+    libmmparser_lite \
+    libmmrtpdecoder \
+    libmmrtpencoder \
+    libwfdavenhancements \
     libwfdclient \
+    libwfdcommonutils \
+    libwfdconfigutils \
+    libwfddisplayconfig \
+    libwfdmminterface \
+    libwfdmmsink \
+    libwfdmmsrc_system \
     libwfdnative \
+    libwfdrtsp \
+    libwfdservice \
+    libwfdsinksm \
+    libwfduibcinterface \
+    libwfduibcsink \
+    libwfduibcsinkinterface \
+    libwfduibcsrc \
+    libwfduibcsrcinterface \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.fm@1.0 \
+    vendor.qti.hardware.wifidisplaysession@1.0 \
     vendor.qti.imsrtpservice@3.0 \
     vendor.qti.imsrtpservice@3.1 \
     CACertService \
@@ -486,7 +486,7 @@ PRODUCT_PACKAGES += \
     wifidisplayhalservice \
     xtra-daemon \
     dpmd \
-    wfdservice
+    wfdservice64
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \