update shim library

Change-Id: Ibc16ce3945041e272ffc69bf53ecca2912f56ee8

diff --git a/libmtk_symbols/Android.mk b/libmtk_symbols/Android.mk
index 6ee633c603ec4b1e19c1b2a8dccf1d4727231f83..4458c01ea9f91946d1f065144acf8b546509a7bc 100644 (file)
--- a/libmtk_symbols/Android.mk
+++ b/libmtk_symbols/Android.mk
@@ -25,7 +25,8 @@ LOCAL_SRC_FILES := \
     mtk_omx.cpp \
     mtk_ui.cpp \
        mtk_icu53.cpp \
-       mtk_wvm.cpp
+       mtk_wvm.cpp \
+       mtk_sensor.cpp
 
 LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libgui libui libicuuc libstagefright
 LOCAL_MODULE := libmtk_symbols

diff --git a/libmtk_symbols/mtk_asc.cpp b/libmtk_symbols/mtk_asc.cpp
index 8cc75ba2ecef1842f2308c9fb88724152d90b975..af42020607cfd502da0936e21798ac9772f8a7a8 100644 (file)
--- a/libmtk_symbols/mtk_asc.cpp
+++ b/libmtk_symbols/mtk_asc.cpp
@@ -1,9 +1,9 @@
 #include <stdint.h>
 
 extern "C" {
-    void _ZN7android14SurfaceControl8setLayerEj(uint32_t);
+    //void _ZN7android14SurfaceControl8setLayerEj(uint32_t);
 
     void _ZN7android14SurfaceControl8setLayerEi(int32_t layer){
-        _ZN7android14SurfaceControl8setLayerEj(static_cast<uint32_t>(layer));
+        //_ZN7android14SurfaceControl8setLayerEj(static_cast<uint32_t>(layer));
     }
 }
\ No newline at end of file

diff --git a/libmtk_symbols/mtk_cam.cpp b/libmtk_symbols/mtk_cam.cpp
index 4fcc271a1b169cf20653d98d1274fdf1c83474d9..caa5beb81ee94b36775deda0f45c9ec9fbd4cba3 100644 (file)
--- a/libmtk_symbols/mtk_cam.cpp
+++ b/libmtk_symbols/mtk_cam.cpp
@@ -5,44 +5,10 @@
 #include <pthread.h>
 
 extern "C" {
-    //android::String8::String8(char const*)
-    extern void _ZN7android7String8C1EPKc(void **str8P, const char *str);
-
-    //android::String8::~String8()
-    extern void _ZN7android7String8D1Ev(void **str8P);
-
-    //android::String16::String16(char const*)
-    extern void _ZN7android8String16C1EPKc(void **str16P, const char *str);
-
-    //android::String16::~String16()
-    extern void _ZN7android8String16D1Ev(void **str16P);
-
-    //android::SensorManager::SensorManager(android::String16 const&)
-    extern void _ZN7android13SensorManagerC1ERKNS_8String16E(void *sensorMgr, void **str16P);
-
-    //android::SensorManager::createEventQueue(android::String8, int)
-    extern void _ZN7android13SensorManager16createEventQueueENS_7String8Ei(void **retVal, void *sensorMgr, void **str8P, int mode);
-       
-       //void _ZN7android9SingletonINS_13SensorManagerEE9sInstanceE() { }
-       //void _ZN7android9SingletonINS_13SensorManagerEE5sLockE() { }
-       //void _ZN7android13SensorManagerC1Ev() { }
-       //void _ZN7android13SensorManager16createEventQueueEv() { }
        void* _ZN7android9SingletonINS_13SensorManagerEE9sInstanceE = NULL;
        pthread_mutex_t _ZN7android9SingletonINS_13SensorManagerEE5sLockE = PTHREAD_MUTEX_INITIALIZER;
 
-       void _ZN7android13SensorManagerC1Ev(void *sensorMgr) {
-               void *string;
-
-               _ZN7android8String16C1EPKc(&string, "gpsd");
-               _ZN7android13SensorManagerC1ERKNS_8String16E(sensorMgr, &string);
-               _ZN7android8String16D1Ev(&string);
-       }
-
-       void _ZN7android13SensorManager16createEventQueueEv(void **retVal, void *sensorMgr) {
-               void *string;
+       void _ZN7android13SensorManagerC1Ev(void *sensorMgr) { }
 
-               _ZN7android7String8C1EPKc(&string, "");
-               _ZN7android13SensorManager16createEventQueueENS_7String8Ei(retVal, sensorMgr, &string, 0);
-               _ZN7android7String8D1Ev(&string);
-       }
+       void _ZN7android13SensorManager16createEventQueueEv(void **retVal, void *sensorMgr) { }
 }

diff --git a/libmtk_symbols/mtk_gui.cpp b/libmtk_symbols/mtk_gui.cpp
index 3f3f9a11f5112c2c50bffcd721c869ac04dca8c1..3196930bafed82fef4778a0d50db9c1f41053b11 100644 (file)
--- a/libmtk_symbols/mtk_gui.cpp
+++ b/libmtk_symbols/mtk_gui.cpp
@@ -1,17 +1,34 @@
 #include <ui/GraphicBufferMapper.h>
 #include <ui/PixelFormat.h>
 #include <ui/Rect.h>
+#include <gui/BufferQueue.h>
 #include <stdint.h>
 
 extern "C" {
     void _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE(
-            uint32_t inWidth, uint32_t inHeight, android::PixelFormat inFormat,
+            void *(pthis), uint32_t inWidth, uint32_t inHeight, int inFormat,
             uint32_t inUsage, std::string requestorName);
 
-    void _ZN7android13GraphicBufferC1Ejjij(uint32_t inWidth, uint32_t inHeight, int32_t inFormat, uint32_t inUsage) {
+    void _ZN7android13GraphicBufferC1Ejjij(void *(pthis), uint32_t inWidth, uint32_t inHeight, int inFormat, uint32_t inUsage) {
         _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE(
-            inWidth, inHeight, inFormat, inUsage, "<Unknown>");
+            pthis, inWidth, inHeight, inFormat, inUsage, "<Unknown>");
     }
 
        void _ZN7android11IDumpTunnel11asInterfaceERKNS_2spINS_7IBinderEEE() {}
+       
+       // android::BufferQueue::createBufferQueue(android::sp<android::IGraphicBufferProducer>*, android::sp<android::IGraphicBufferConsumer>*, android::sp<android::IGraphicBufferAlloc> const&)
+       // android::BufferQueue::createBufferQueue(android::sp<android::IGraphicBufferProducer>*, android::sp<android::IGraphicBufferConsumer>*, bool)
+       void _ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEERKNS1_INS_19IGraphicBufferAllocEEE (android::sp<android::IGraphicBufferProducer>* outProducer,
+            android::sp<android::IGraphicBufferConsumer>* outConsumer,
+            void** allocator = NULL) {
+
+               android::BufferQueue::createBufferQueue(outProducer, outConsumer, true);
+       }
+       
+       
+    void _ZN7android13GraphicBufferC1EjjijjjP13native_handleb(uint32_t, uint32_t, int32_t, uint32_t, uint32_t, uint32_t, native_handle_t*, bool);
+
+    void _ZN7android13GraphicBufferC1EjjijjP13native_handleb(uint32_t inWidth, uint32_t inHeight, int32_t inFormat, uint32_t inUsage, uint32_t inStride, native_handle_t* inHandle, bool keepOwnership) {
+        _ZN7android13GraphicBufferC1EjjijjjP13native_handleb(inWidth, inHeight, inFormat, 1, inUsage, inStride, inHandle, keepOwnership);
+    }
 }

diff --git a/libmtk_symbols/mtk_sensor.cpp b/libmtk_symbols/mtk_sensor.cpp
new file mode 100644 (file)
index 0000000..37b95f6
--- /dev/null
+++ b/libmtk_symbols/mtk_sensor.cpp
@@ -0,0 +1,9 @@
+extern "C" {
+  void _ZN7android16SensorEventQueue4readEP12ASensorEventj() {}
+
+  void _ZNK7android16SensorEventQueue5getFdEv() {}
+
+  void _ZNK7android16SensorEventQueue13disableSensorEPKNS_6SensorE() {}
+
+  void _ZNK7android16SensorEventQueue12enableSensorEPKNS_6SensorE() {}
+}