Libshim : bring in sensor shim for lp sensor blobs

Change-Id: I9b4e30d2d4ed55c34729d6505ace59333b1e56e2

4 files changed, 88 insertions, 2 deletions

diff --git a/libshims/Android.mk b/libshims/Android.mk
index e62c559..99393dc 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -39,3 +39,16 @@ LOCAL_MODULE := libshim_gpsd
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
+
+# sensors
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+     icu53.c
+
+LOCAL_SHARED_LIBRARIES := libicuuc libicui18n
+LOCAL_MODULE := libshim_sensors
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/icu53.c b/libshims/icu53.c
new file mode 100644
index 0000000..a7752fd
--- /dev/null
+++ b/libshims/icu53.c
@@ -0,0 +1,72 @@
+#include "unicode/ucnv.h"
+
+U_STABLE UConverter* U_EXPORT2
+ucnv_open_53(const char *converterName, UErrorCode *err)
+{
+    return ucnv_open(converterName, err);
+}
+
+U_STABLE void  U_EXPORT2
+ucnv_close_53(UConverter * converter)
+{
+    return ucnv_close(converter);
+}
+
+U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP_53(
+                  const void *context,
+                  UConverterToUnicodeArgs *toUArgs,
+                  const char* codeUnits,
+                  int32_t length,
+                  UConverterCallbackReason reason,
+                  UErrorCode * err)
+{
+    UCNV_TO_U_CALLBACK_STOP(context, toUArgs, codeUnits, length, reason, err);
+}
+
+U_STABLE void U_EXPORT2 UCNV_FROM_U_CALLBACK_STOP_53(
+                  const void *context,
+                  UConverterFromUnicodeArgs *fromUArgs,
+                  const UChar* codeUnits,
+                  int32_t length,
+                  UChar32 codePoint,
+                  UConverterCallbackReason reason,
+                  UErrorCode * err)
+{
+    UCNV_FROM_U_CALLBACK_STOP (context, fromUArgs, codeUnits, length, codePoint, reason, err);
+}
+
+U_STABLE void U_EXPORT2
+ucnv_setToUCallBack_53(UConverter * converter,
+                     UConverterToUCallback newAction,
+                     const void* newContext,
+                     UConverterToUCallback *oldAction,
+                     const void** oldContext,
+                     UErrorCode * err)
+{
+    ucnv_setToUCallBack(converter, newAction, newContext, oldAction, oldContext, err);
+}
+
+U_STABLE void U_EXPORT2
+ucnv_setFromUCallBack_53(UConverter * converter,
+                       UConverterFromUCallback newAction,
+                       const void *newContext,
+                       UConverterFromUCallback *oldAction,
+                       const void **oldContext,
+                       UErrorCode * err)
+{
+    ucnv_setFromUCallBack(converter, newAction, newContext, oldAction, oldContext, err);
+}
+
+U_STABLE void U_EXPORT2
+ucnv_convertEx_53(UConverter *targetCnv, UConverter *sourceCnv,
+               char **target, const char *targetLimit,
+               const char **source, const char *sourceLimit,
+               UChar *pivotStart, UChar **pivotSource,
+               UChar **pivotTarget, const UChar *pivotLimit,
+               UBool reset, UBool flush,
+               UErrorCode *pErrorCode)
+{
+    ucnv_convertEx(targetCnv, sourceCnv, target, targetLimit, source, sourceLimit,
+                   pivotStart, pivotSource, pivotTarget, pivotLimit, reset, flush,
+                   pErrorCode);
+}
diff --git a/mofd.mk b/mofd.mk
index 2c5ecc9..1164383 100644
--- a/mofd.mk
+++ b/mofd.mk
@@ -232,7 +232,8 @@ PRODUCT_COPY_FILES += \
 # Shims
 PRODUCT_PACKAGES += \
     libshim_icu \
-    libshim_gpsd
+    libshim_gpsd \
+    libshim_sensors
 
 # Thermal itux
 ENABLE_ITUXD := true
diff --git a/rootdir/etc/init.mofd_v1.rc b/rootdir/etc/init.mofd_v1.rc
index 1b5bc9a..133082f 100644
--- a/rootdir/etc/init.mofd_v1.rc
+++ b/rootdir/etc/init.mofd_v1.rc
@@ -16,7 +16,7 @@ on early-init
     setprop ro.boot.min.cap 0
 
 on init
-    export LD_SHIM_LIBS /system/lib/libicuuc.so|libshim_icu.so:/system/lib/hw/camera.vendor.mofd_v1.so|libshim_camera.so:/system/bin/gpsd|libshim_gpsd.so
+    export LD_SHIM_LIBS /system/lib/libicuuc.so|libshim_icu.so:/system/lib/hw/camera.vendor.mofd_v1.so|libshim_camera.so:/system/bin/gpsd|libshim_gpsd.so:/system/lib/hw/sensors.mofd_v1.so|libshim_sensors.so
 
     write /sys/class/graphics/fbcon/cursor_blink 0
     mkdir /data/system/ 0770 system system