sm7325-common: Turn "64-bit" rfsa copy into symlink

Change-Id: Id512eb7cf282fab9a7625cb8b75ab895fc8af26d

Android.bp

@@ -2105,50 +2105,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libsns_device_mode_skel",
-	owner: "motorola",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so"],
-			shared_libs: ["libc", "libgcc", ],
-		},
-		android_arm: {
-			srcs: ["proprietary/vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so"],
-			shared_libs: ["libc", "libgcc", ],
-		},
-	},
-	compile_multilib: "both",
-	relative_install_path: "rfsa/adsp",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libsns_low_lat_stream_skel",
-	owner: "motorola",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so"],
-			shared_libs: ["libc", "libgcc", ],
-		},
-		android_arm: {
-			srcs: ["proprietary/vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so"],
-			shared_libs: ["libc", "libgcc", ],
-		},
-	},
-	compile_multilib: "both",
-	relative_install_path: "rfsa/adsp",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libasphere",
 	owner: "motorola",
@@ -11207,6 +11163,20 @@ install_symlink {
 	symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so",
 }
 
+install_symlink {
+	name: "libsns_device_mode_skel_libsns_device_mode_skel_symlink64",
+	soc_specific: true,
+	installed_location: "lib64/rfsa/adsp/libsns_device_mode_skel.so",
+	symlink_target: "/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so",
+}
+
+install_symlink {
+	name: "libsns_low_lat_stream_skel_libsns_low_lat_stream_skel_symlink64",
+	soc_specific: true,
+	installed_location: "lib64/rfsa/adsp/libsns_low_lat_stream_skel.so",
+	symlink_target: "/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so",
+}
+
 install_symlink {
 	name: "libEGL_adreno_libEGL_adreno_symlink64",
 	soc_specific: true,

sm7325-common-vendor.mk

@@ -422,8 +422,6 @@ PRODUCT_PACKAGES += \
     libvpphcp \
     libvpphvx \
     libvpplibrary \
-    libsns_device_mode_skel \
-    libsns_low_lat_stream_skel \
     libasphere \
     libqcbassboost \
     libqcreverb \
@@ -992,6 +990,8 @@ PRODUCT_PACKAGES += \
     libEGL_adreno_libEGL_adreno_symlink32 \
     libGLESv2_adreno_libGLESv2_adreno_symlink32 \
     libq3dtools_adreno_libq3dtools_adreno_symlink32 \
+    libsns_device_mode_skel_libsns_device_mode_skel_symlink64 \
+    libsns_low_lat_stream_skel_libsns_low_lat_stream_skel_symlink64 \
     libEGL_adreno_libEGL_adreno_symlink64 \
     libGLESv2_adreno_libGLESv2_adreno_symlink64 \
     libq3dtools_adreno_libq3dtools_adreno_symlink64