sdm660: Add back MiWatermark lib and remove shim

Change-Id: I7611b322b2f2935fc9079f9a76f9f5d9096aec00
This commit is contained in:
Max Weffers 2020-01-11 22:18:41 +01:00
parent 7473b3d0c1
commit 970e87ee2b
No known key found for this signature in database
GPG key ID: 795F73D22FB93FAE
4 changed files with 1 additions and 30 deletions

View file

@ -76,7 +76,6 @@ function blob_fixup() {
;; ;;
vendor/lib/hw/camera.sdm660.so) vendor/lib/hw/camera.sdm660.so)
patchelf --replace-needed libMiWatermark.so libMiWatermark_shim.so "${2}"
patchelf --add-needed camera.sdm660_shim.so "${2}" patchelf --add-needed camera.sdm660_shim.so "${2}"
;; ;;

View file

@ -1,17 +0,0 @@
/* libMiWatermark */
cc_library_shared {
name: "libMiWatermark_shim",
proprietary: true,
defaults: ["hidl_defaults"],
srcs: [
"miwatermark.cpp",
],
cflags: [
"-Werror",
"-Wextra",
"-Wall",
],
shared_libs: [
"libutils",
],
}

View file

@ -1,10 +0,0 @@
#include <stdint.h>
namespace android {
extern "C" void miwatermark_age() {}
extern "C" void miwatermark_deinit() {}
extern "C" void miwatermark_dualcamera() {}
extern "C" void miwatermark_init() {}
extern "C" void miwatermark_score() {}
extern "C" void miwatermark_time() {}
}

View file

@ -463,8 +463,7 @@ BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
# Shims # Shims
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
camera.sdm660_shim \ camera.sdm660_shim
libMiWatermark_shim
# Soong # Soong
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \