sm7325-common: Drop suffix _vendor from audio blobs

Android.bp

@@ -4216,8 +4216,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "liba2dpoffload_vendor",
-	stem: "liba2dpoffload",
+	name: "liba2dpoffload",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4302,8 +4301,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libbatterylistener_vendor",
-	stem: "libbatterylistener",
+	name: "libbatterylistener",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4320,8 +4318,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libcirrusspkrprot_vendor",
-	stem: "libcirrusspkrprot",
+	name: "libcirrusspkrprot",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4338,8 +4335,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libcomprcapture_vendor",
-	stem: "libcomprcapture",
+	name: "libcomprcapture",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4373,8 +4369,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libexthwplugin_vendor",
-	stem: "libexthwplugin",
+	name: "libexthwplugin",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4391,8 +4386,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhdmiedid_vendor",
-	stem: "libhdmiedid",
+	name: "libhdmiedid",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4409,8 +4403,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhdmipassthru_vendor",
-	stem: "libhdmipassthru",
+	name: "libhdmipassthru",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4427,8 +4420,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhfp_vendor",
-	stem: "libhfp",
+	name: "libhfp",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4547,8 +4539,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libsndmonitor_vendor",
-	stem: "libsndmonitor",
+	name: "libsndmonitor",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -4582,8 +4573,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libspkrprot_vendor",
-	stem: "libspkrprot",
+	name: "libspkrprot",
 	owner: "samsung",
 	strip: {
 		none: true,

sm7325-common-vendor.mk

@@ -458,28 +458,28 @@ PRODUCT_PACKAGES += \
     lib_SamsungRec_07010 \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
-    liba2dpoffload_vendor \
+    liba2dpoffload \
     libadm \
     libaudio_log_utils \
     libaudio_soundtrigger \
     libaudioparsers \
-    libbatterylistener_vendor \
-    libcirrusspkrprot_vendor \
-    libcomprcapture_vendor \
+    libbatterylistener \
+    libcirrusspkrprot \
+    libcomprcapture \
     libdrc \
-    libexthwplugin_vendor \
-    libhdmiedid_vendor \
-    libhdmipassthru_vendor \
-    libhfp_vendor \
+    libexthwplugin \
+    libhdmiedid \
+    libhdmipassthru \
+    libhfp \
     libprofileparamstorage \
     libqtigef \
     librecordalive \
     libsamsungVoipResampler \
     libsecaudiocoreutils \
     libsecaudioinfo \
-    libsndmonitor_vendor \
+    libsndmonitor \
     libspatializerparamstorage \
-    libspkrprot_vendor \
+    libspkrprot \
     libsurround_3mic_proc \
     libwvhidl \
     libwvdrmengine \