summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Saini <sainiashish08@gmail.com>2017-12-28 19:21:51 +0530
committerHemant Sharma <hemantbeast@gmail.com>2018-01-14 15:57:25 +0000
commitd4ab9946872ddf80453cd13c668f3d1b51e5e3fe (patch)
tree9d8daeafea06072aaab5399797af8e6c275c52a0
parentda5011ea7773a1500ca191d3d225d813a19a1211 (diff)
armani: camera: Add camera libshim
Camera module was unable to load symbol *android::CameraParameters::WHITE_BALANCE_MANUAL_CCT *android::CameraParameters::FOCUS_MODE_MANUAL_POSITION Change-Id: I053ba7b43092b621df22bf9e416f68ad910bcbe2
-rw-r--r--device.mk1
-rw-r--r--libshims/Android.mk12
-rw-r--r--libshims/camera_shim.cpp2
-rwxr-xr-xrootdir/init.armani.rc1
4 files changed, 14 insertions, 2 deletions
diff --git a/device.mk b/device.mk
index c388577..293d248 100644
--- a/device.mk
+++ b/device.mk
@@ -83,6 +83,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Camera
PRODUCT_PACKAGES += \
camera.msm8226 \
+ libshim_camera \
libxml2 \
Snap
diff --git a/libshims/Android.mk b/libshims/Android.mk
index 54ac9c4..0fcd34d 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,4 +22,12 @@ LOCAL_SRC_FILES := thermal.c
LOCAL_MODULE := libshims_thermal
LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY) \ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := camera_shim.cpp
+LOCAL_MODULE := libshim_camera
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/camera_shim.cpp b/libshims/camera_shim.cpp
new file mode 100644
index 0000000..c1be8c2
--- /dev/null
+++ b/libshims/camera_shim.cpp
@@ -0,0 +1,2 @@
+const char *_ZN7android16CameraParameters24WHITE_BALANCE_MANUAL_CCTE = "manual-cct";
+const char *_ZN7android16CameraParameters26FOCUS_MODE_MANUAL_POSITIONE = "manual"; \ No newline at end of file
diff --git a/rootdir/init.armani.rc b/rootdir/init.armani.rc
index bc2a880..4b8800f 100755
--- a/rootdir/init.armani.rc
+++ b/rootdir/init.armani.rc
@@ -28,6 +28,7 @@
import init.armani.usb.rc
on early-init
+ export LD_SHIM_LIBS /system/vendor/lib/hw/camera.vendor.msm8226.so|libshim_camera.so
write /sys/block/mmcblk0/queue/scheduler noop
mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755
mkdir /firmware 0771 system system