sdm660-common: Nuke libMiWatermark and replace it with a shim
* This lib is creating troubles on android 10 requiring old libs in vendor * Other than that, it's the only culprit for vndk runtime being kept disabled * Nuke this lib via a empty shim providing the symbols to the camera hal
This commit is contained in:
parent
c288e2ee18
commit
90ab2176ea
4 changed files with 29 additions and 0 deletions
|
@ -79,3 +79,4 @@ sed -i "s|/system/etc/firmware|/vendor/firmware\x0\x0\x0\x0|g" "$DEVICE_BLOB_ROO
|
||||||
# Load camera.sdm660.so shim
|
# Load camera.sdm660.so shim
|
||||||
CAM_SDM660="$DEVICE_BLOB_ROOT"/vendor/lib/hw/camera.sdm660.so
|
CAM_SDM660="$DEVICE_BLOB_ROOT"/vendor/lib/hw/camera.sdm660.so
|
||||||
patchelf --add-needed camera.sdm660_shim.so "$CAM_SDM660"
|
patchelf --add-needed camera.sdm660_shim.so "$CAM_SDM660"
|
||||||
|
patchelf --replace-needed libMiWatermark.so libMiWatermark_shim.so "$CAM_SDM660"
|
||||||
|
|
17
libshims/Android.bp
Normal file
17
libshims/Android.bp
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
/* libMiWatermark */
|
||||||
|
cc_library_shared {
|
||||||
|
name: "libMiWatermark_shim",
|
||||||
|
proprietary: true,
|
||||||
|
defaults: ["hidl_defaults"],
|
||||||
|
srcs: [
|
||||||
|
"miwatermark.cpp",
|
||||||
|
],
|
||||||
|
cflags: [
|
||||||
|
"-Werror",
|
||||||
|
"-Wextra",
|
||||||
|
"-Wall",
|
||||||
|
],
|
||||||
|
shared_libs: [
|
||||||
|
"libutils",
|
||||||
|
],
|
||||||
|
}
|
10
libshims/miwatermark.cpp
Normal file
10
libshims/miwatermark.cpp
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
#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() {}
|
||||||
|
}
|
|
@ -173,6 +173,7 @@ PRODUCT_PACKAGES += \
|
||||||
libbthost_if
|
libbthost_if
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
libMiWatermark_shim \
|
||||||
Snap
|
Snap
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
Loading…
Reference in a new issue