diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-02-22 17:32:29 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-02-22 20:16:18 +0100 |
| commit | 2f76ede5eb16e6f97adbad3bf050fd8e9c61af7e (patch) | |
| tree | 89b7220a7436aebdaaed94913bbde49515d9f773 /mtk | |
| parent | 5be5731c148d501bfc5251ef2cb998a057658eac (diff) | |
shim: split graphicbufferMapper symbols from gbC1Ejjij ones
Diffstat (limited to 'mtk')
| -rw-r--r-- | mtk/libshims/Android.mk | 3 | ||||
| -rw-r--r-- | mtk/libshims/camera/mtk_gbc1.cpp (renamed from mtk/libshims/camera/mtk_cam.cpp) | 6 | ||||
| -rw-r--r-- | mtk/libshims/camera/mtk_gui.cpp | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/mtk/libshims/Android.mk b/mtk/libshims/Android.mk index caae139..40b0f08 100644 --- a/mtk/libshims/Android.mk +++ b/mtk/libshims/Android.mk @@ -37,7 +37,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - camera/mtk_cam.cpp \ + camera/mtk_gui.cpp \ + camera/mtk_gbc1.cpp \ camera/mtk_omx.cpp LOCAL_SHARED_LIBRARIES := libbinder libgui libui diff --git a/mtk/libshims/camera/mtk_cam.cpp b/mtk/libshims/camera/mtk_gbc1.cpp index 8895113..004c393 100644 --- a/mtk/libshims/camera/mtk_cam.cpp +++ b/mtk/libshims/camera/mtk_gbc1.cpp @@ -3,12 +3,6 @@ #include <ui/Rect.h> extern "C" { - void _ZN7android19GraphicBufferMapper4lockEPK13native_handlejRKNS_4RectEPPv(buffer_handle_t, uint32_t, const android::Rect&, void**); - - void _ZN7android19GraphicBufferMapper4lockEPK13native_handleiRKNS_4RectEPPv(buffer_handle_t handle, int usage, const android::Rect& bounds, void** vaddr) { - _ZN7android19GraphicBufferMapper4lockEPK13native_handlejRKNS_4RectEPPv(handle, static_cast<uint32_t>(usage), bounds, vaddr); - } - void _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE( uint32_t inWidth, uint32_t inHeight, android::PixelFormat inFormat, uint32_t inUsage, std::string requestorName); diff --git a/mtk/libshims/camera/mtk_gui.cpp b/mtk/libshims/camera/mtk_gui.cpp new file mode 100644 index 0000000..e47f781 --- /dev/null +++ b/mtk/libshims/camera/mtk_gui.cpp @@ -0,0 +1,10 @@ +#include <ui/GraphicBufferMapper.h> +#include <ui/Rect.h> + +extern "C" { + void _ZN7android19GraphicBufferMapper4lockEPK13native_handlejRKNS_4RectEPPv(buffer_handle_t, uint32_t, const android::Rect&, void**); + + void _ZN7android19GraphicBufferMapper4lockEPK13native_handleiRKNS_4RectEPPv(buffer_handle_t handle, int usage, const android::Rect& bounds, void** vaddr) { + _ZN7android19GraphicBufferMapper4lockEPK13native_handlejRKNS_4RectEPPv(handle, static_cast<uint32_t>(usage), bounds, vaddr); + } +} |