more

Change-Id: I5244e9648d92aa35da5dfbb1de2b8eaaa59e3096

diff --git a/Android.mk b/Android.mk
index a0513d979fc06f50cb455fb438650c6beb11a8a7..e42c80c80ef249a13648b1bbe8be31d164691ab7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -21,23 +21,31 @@ ifneq ($(filter dreamlte dream2lte greatlte,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libGLES_mali
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := proprietary/vendor/lib/egl/libGLES_mali.so
+LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/egl/libGLES_mali.so
+LOCAL_SRC_FILES_32 := proprietary/vendor/lib/egl/libGLES_mali.so
+LOCAL_MULTILIB := both
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/egl
+LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES)/egl
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/egl
 
 SYMLINKS := $(TARGET_OUT)/vendor
 $(SYMLINKS):
        @echo "Symlink: vulkan.exynos5.so"
        @mkdir -p $@/lib/hw
+       @mkdir -p $@/lib64/hw
        $(hide) ln -sf ../egl/libGLES_mali.so $@/lib/hw/vulkan.exynos5.so
+       $(hide) ln -sf ../egl/libGLES_mali.so $@/lib64/hw/vulkan.exynos5.so
        @echo "Symlink: libOpenCL.so"
        $(hide) ln -sf egl/libGLES_mali.so $@/lib/libOpenCL.so
+       $(hide) ln -sf egl/libGLES_mali.so $@/lib64/libOpenCL.so
        @echo "Symlink: libOpenCL.so.1"
        $(hide) ln -sf egl/libGLES_mali.so $@/lib/libOpenCL.so.1
+       $(hide) ln -sf egl/libGLES_mali.so $@/lib64/libOpenCL.so.1
        @echo "Symlink: libOpenCL.so.1.1"
        $(hide) ln -sf egl/libGLES_mali.so $@/lib/libOpenCL.so.1.1
+       $(hide) ln -sf egl/libGLES_mali.so $@/lib64/libOpenCL.so.1.1
 
 ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
        $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS)

diff --git a/proprietary/lib/android.hardware.camera.common@1.0.so b/proprietary/lib/android.hardware.camera.common@1.0.so
deleted file mode 100644 (file)
index ffe512f..0000000
Binary files a/proprietary/lib/android.hardware.camera.common@1.0.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.camera.device@1.0.so b/proprietary/lib/android.hardware.camera.device@1.0.so
deleted file mode 100644 (file)
index 16c16af..0000000
Binary files a/proprietary/lib/android.hardware.camera.device@1.0.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.camera.device@3.2.so b/proprietary/lib/android.hardware.camera.device@3.2.so
deleted file mode 100644 (file)
index 7de0f7f..0000000
Binary files a/proprietary/lib/android.hardware.camera.device@3.2.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.camera.device@3.3.so b/proprietary/lib/android.hardware.camera.device@3.3.so
deleted file mode 100644 (file)
index 9ac6b7d..0000000
Binary files a/proprietary/lib/android.hardware.camera.device@3.3.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.camera.device@3.4.so b/proprietary/lib/android.hardware.camera.device@3.4.so
deleted file mode 100644 (file)
index b6868db..0000000
Binary files a/proprietary/lib/android.hardware.camera.device@3.4.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.camera.provider@2.4.so b/proprietary/lib/android.hardware.camera.provider@2.4.so
deleted file mode 100644 (file)
index 38c324e..0000000
Binary files a/proprietary/lib/android.hardware.camera.provider@2.4.so and /dev/null differ

diff --git a/proprietary/lib/vendor.samsung.hardware.camera.device@1.0.so b/proprietary/lib/vendor.samsung.hardware.camera.device@1.0.so
deleted file mode 100644 (file)
index 4bd2e3a..0000000
Binary files a/proprietary/lib/vendor.samsung.hardware.camera.device@1.0.so and /dev/null differ

diff --git a/proprietary/lib/vendor.samsung.hardware.camera.device@3.2.so b/proprietary/lib/vendor.samsung.hardware.camera.device@3.2.so
deleted file mode 100644 (file)
index d1e3322..0000000
Binary files a/proprietary/lib/vendor.samsung.hardware.camera.device@3.2.so and /dev/null differ

diff --git a/proprietary/lib/vendor.samsung.hardware.camera.device@3.3.so b/proprietary/lib/vendor.samsung.hardware.camera.device@3.3.so
deleted file mode 100644 (file)
index 6cd573d..0000000
Binary files a/proprietary/lib/vendor.samsung.hardware.camera.device@3.3.so and /dev/null differ

diff --git a/proprietary/lib/vendor.samsung.hardware.camera.device@3.4.so b/proprietary/lib/vendor.samsung.hardware.camera.device@3.4.so
deleted file mode 100644 (file)
index f779fee..0000000
Binary files a/proprietary/lib/vendor.samsung.hardware.camera.device@3.4.so and /dev/null differ

diff --git a/proprietary/lib/vendor.samsung.hardware.camera.provider@2.4.so b/proprietary/lib/vendor.samsung.hardware.camera.provider@2.4.so
deleted file mode 100644 (file)
index 0d17c9f..0000000
Binary files a/proprietary/lib/vendor.samsung.hardware.camera.provider@2.4.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.common@1.0.so b/proprietary/lib64/android.hardware.camera.common@1.0.so
deleted file mode 100644 (file)
index ea27b56..0000000
Binary files a/proprietary/lib64/android.hardware.camera.common@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.device@1.0.so b/proprietary/lib64/android.hardware.camera.device@1.0.so
deleted file mode 100644 (file)
index 093996e..0000000
Binary files a/proprietary/lib64/android.hardware.camera.device@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.device@3.2.so b/proprietary/lib64/android.hardware.camera.device@3.2.so
deleted file mode 100644 (file)
index b93b0b3..0000000
Binary files a/proprietary/lib64/android.hardware.camera.device@3.2.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.device@3.3.so b/proprietary/lib64/android.hardware.camera.device@3.3.so
deleted file mode 100644 (file)
index ae8a4d7..0000000
Binary files a/proprietary/lib64/android.hardware.camera.device@3.3.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.device@3.4.so b/proprietary/lib64/android.hardware.camera.device@3.4.so
deleted file mode 100644 (file)
index 4c7e6f5..0000000
Binary files a/proprietary/lib64/android.hardware.camera.device@3.4.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.camera.provider@2.4.so b/proprietary/lib64/android.hardware.camera.provider@2.4.so
deleted file mode 100644 (file)
index c37d69f..0000000
Binary files a/proprietary/lib64/android.hardware.camera.provider@2.4.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.camera.device@1.0.so b/proprietary/lib64/vendor.samsung.hardware.camera.device@1.0.so
deleted file mode 100644 (file)
index cc39e2e..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.camera.device@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.2.so b/proprietary/lib64/vendor.samsung.hardware.camera.device@3.2.so
deleted file mode 100644 (file)
index 7c00e6b..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.2.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.3.so b/proprietary/lib64/vendor.samsung.hardware.camera.device@3.3.so
deleted file mode 100644 (file)
index 7f4d5ff..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.3.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.4.so b/proprietary/lib64/vendor.samsung.hardware.camera.device@3.4.so
deleted file mode 100644 (file)
index c4574bf..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.camera.device@3.4.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.camera.provider@2.4.so b/proprietary/lib64/vendor.samsung.hardware.camera.provider@2.4.so
deleted file mode 100644 (file)
index 6fa0599..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.camera.provider@2.4.so and /dev/null differ

diff --git a/proprietary/vendor/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so b/proprietary/vendor/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so
deleted file mode 100644 (file)
index abf08b5..0000000
Binary files a/proprietary/vendor/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib/vendor.samsung.camera.device@1.0-impl.so b/proprietary/vendor/lib/vendor.samsung.camera.device@1.0-impl.so
deleted file mode 100644 (file)
index 238a7e8..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.camera.device@1.0-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib/vendor.samsung.camera.device@3.2-impl.so b/proprietary/vendor/lib/vendor.samsung.camera.device@3.2-impl.so
deleted file mode 100644 (file)
index 66cba46..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.camera.device@3.2-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib/vendor.samsung.camera.device@3.3-impl.so b/proprietary/vendor/lib/vendor.samsung.camera.device@3.3-impl.so
deleted file mode 100644 (file)
index df2c48b..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.camera.device@3.3-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib/vendor.samsung.camera.device@3.4-impl.so b/proprietary/vendor/lib/vendor.samsung.camera.device@3.4-impl.so
deleted file mode 100644 (file)
index c1695a1..0000000
Binary files a/proprietary/vendor/lib/vendor.samsung.camera.device@3.4-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so b/proprietary/vendor/lib64/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so
deleted file mode 100644 (file)
index 80fd99c..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/vendor.samsung.camera.device@1.0-impl.so b/proprietary/vendor/lib64/vendor.samsung.camera.device@1.0-impl.so
deleted file mode 100644 (file)
index e86ec10..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.camera.device@1.0-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.2-impl.so b/proprietary/vendor/lib64/vendor.samsung.camera.device@3.2-impl.so
deleted file mode 100644 (file)
index 8b93608..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.2-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.3-impl.so b/proprietary/vendor/lib64/vendor.samsung.camera.device@3.3-impl.so
deleted file mode 100644 (file)
index 0d83c52..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.3-impl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so b/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so
deleted file mode 100644 (file)
index ca468ce..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so and /dev/null differ

diff --git a/universal8895-common-vendor.mk b/universal8895-common-vendor.mk
index b960ac9f7ffb7d349a0617bddccdf9b2826db280..b47fc2d1fbf44074ac56f3ce45be518a3c04529a 100644 (file)
--- a/universal8895-common-vendor.mk
+++ b/universal8895-common-vendor.mk
@@ -58,12 +58,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/etc/nfc_key:system/etc/nfc_key \
     vendor/samsung/universal8895-common/proprietary/etc/nfcee_access.xml:system/etc/nfcee_access.xml \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.bluetooth.a2dp@1.0.so:system/lib/android.hardware.bluetooth.a2dp@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.common@1.0.so:system/lib/android.hardware.camera.common@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.device@1.0.so:system/lib/android.hardware.camera.device@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.device@3.2.so:system/lib/android.hardware.camera.device@3.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.device@3.3.so:system/lib/android.hardware.camera.device@3.3.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.device@3.4.so:system/lib/android.hardware.camera.device@3.4.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.provider@2.4.so:system/lib/android.hardware.camera.provider@2.4.so \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.gnss@1.0.so:system/lib/android.hardware.gnss@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.gnss@1.1.so:system/lib/android.hardware.gnss@1.1.so \
     vendor/samsung/universal8895-common/proprietary/lib/hw/audio.playback_record.default.so:system/lib/hw/audio.playback_record.default.so \
@@ -122,11 +116,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.VP9.Decoder.so:system/lib/omx/libOMX.Exynos.VP9.Decoder.so \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.VP9.Encoder.so:system/lib/omx/libOMX.Exynos.VP9.Encoder.so \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.WMV.Decoder.so:system/lib/omx/libOMX.Exynos.WMV.Decoder.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@1.0.so:system/lib/vendor.samsung.hardware.camera.device@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@3.2.so:system/lib/vendor.samsung.hardware.camera.device@3.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@3.3.so:system/lib/vendor.samsung.hardware.camera.device@3.3.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@3.4.so:system/lib/vendor.samsung.hardware.camera.device@3.4.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.provider@2.4.so:system/lib/vendor.samsung.hardware.camera.provider@2.4.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.gnss@1.0.so:system/lib/vendor.samsung.hardware.gnss@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.radio.channel@1.0.so:system/lib/vendor.samsung.hardware.radio.channel@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.radio.secbridge@1.0.so:system/lib/vendor.samsung.hardware.radio.secbridge@1.0.so \
@@ -136,12 +125,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.trustonic.teeregistry@1.0.so:system/lib/vendor.trustonic.teeregistry@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.bluetooth.a2dp@1.0.so:system/lib64/android.hardware.bluetooth.a2dp@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.bluetooth@1.0.so:system/lib64/android.hardware.bluetooth@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.common@1.0.so:system/lib64/android.hardware.camera.common@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.device@1.0.so:system/lib64/android.hardware.camera.device@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.device@3.2.so:system/lib64/android.hardware.camera.device@3.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.device@3.3.so:system/lib64/android.hardware.camera.device@3.3.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.device@3.4.so:system/lib64/android.hardware.camera.device@3.4.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.camera.provider@2.4.so:system/lib64/android.hardware.camera.provider@2.4.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.gnss@1.0.so:system/lib64/android.hardware.gnss@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.gnss@1.1.so:system/lib64/android.hardware.gnss@1.1.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.nfc@1.0.so:system/lib64/android.hardware.nfc@1.0.so \
@@ -191,11 +174,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib64/omx/libOMX.Exynos.VP9.Encoder.so:system/lib64/omx/libOMX.Exynos.VP9.Encoder.so \
     vendor/samsung/universal8895-common/proprietary/lib64/omx/libOMX.Exynos.WMV.Decoder.so:system/lib64/omx/libOMX.Exynos.WMV.Decoder.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.bluetooth@1.0.so:system/lib64/vendor.samsung.hardware.bluetooth@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@1.0.so:system/lib64/vendor.samsung.hardware.camera.device@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@3.2.so:system/lib64/vendor.samsung.hardware.camera.device@3.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@3.3.so:system/lib64/vendor.samsung.hardware.camera.device@3.3.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@3.4.so:system/lib64/vendor.samsung.hardware.camera.device@3.4.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.provider@2.4.so:system/lib64/vendor.samsung.hardware.camera.provider@2.4.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.gnss@1.0.so:system/lib64/vendor.samsung.hardware.gnss@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.nfc@1.1.so:system/lib64/vendor.samsung.hardware.nfc@1.1.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio.channel@1.0.so:system/lib64/vendor.samsung.hardware.radio.channel@1.0.so \
@@ -358,7 +336,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/hw/gatekeeper.exynos8895.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/gatekeeper.exynos8895.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/hw/hwcomposer.exynos5.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/hwcomposer.exynos5.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/hw/sound_trigger.primary.universal8895.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sound_trigger.primary.universal8895.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libDLInterface.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libDLInterface.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libExynosHWCService.so:$(TARGET_COPY_OUT_VENDOR)/lib/libExynosHWCService.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libMcClient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMcClient.so \
@@ -426,10 +403,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/soundfx/libplaybackrecorder.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libplaybackrecorder.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/soundfx/libsamsungSoundbooster_plus.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libsamsungSoundbooster_plus.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswdap.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/vendor.samsung.camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.camera.device@1.0-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/vendor.samsung.camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.camera.device@3.2-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/vendor.samsung.camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.camera.device@3.3-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/vendor.samsung.camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.samsung.camera.device@3.4-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@1.0-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.2-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera.device@3.3-impl.so \
@@ -441,7 +414,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/hw/gps.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/gps.default.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/hw/hwcomposer.exynos5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/hwcomposer.exynos5.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/hw/keystore.mdfpp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/keystore.mdfpp.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.samsung.hardware.camera.provider@2.4-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libDLInterface.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libDLInterface.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libExynosHWCService.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libExynosHWCService.so \
@@ -494,11 +466,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/sensors.grip.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.grip.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/sensors.sensorhub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.sensorhub.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libaudioeffectoffload.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libswdap.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@1.0-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.2-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.3-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.4-impl.so
+    vendor/samsung/universal8895-common/proprietary/vendor/lib64/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libswdap.so
 
 # Create Mali links for Vulkan and OpenCL
 PRODUCT_PACKAGES += libGLES_mali