From 23671145917edfe2a2b3f868f4fa018be6db7e57 Mon Sep 17 00:00:00 2001
From: therootlord <igor_cestari@hotmail.com>
Date: Wed, 13 Dec 2017 10:19:11 -0200
Subject: [PATCH] Revert "sanders: cleanup libmot_gpu_mapper shim"

This reverts commit 7bd956a535941945238c9de73745b2f961e07bfc.
---
 device.mk                  |  1 +
 libshims/Android.mk        |  8 +++++++
 libshims/GraphicBuffer.cpp | 44 ++++++++++++++++++++++++++++++++++++++
 rootdir/etc/init.qcom.rc   |  2 +-
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 libshims/GraphicBuffer.cpp

diff --git a/device.mk b/device.mk
index 979b988..c6ea35a 100644
--- a/device.mk
+++ b/device.mk
@@ -102,6 +102,7 @@ PRODUCT_PACKAGES += \
 # Camera
 PRODUCT_PACKAGES += \
     libbson \
+    libshim_camera \
     Camera2 \
     camera.device@1.0-impl \
     camera.device@3.2-impl \
diff --git a/libshims/Android.mk b/libshims/Android.mk
index bb0868f..d4b49c7 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -24,6 +24,14 @@ LOCAL_MODULE := libshim_adsp
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)
 
+# Camera
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := GraphicBuffer.cpp
+LOCAL_SHARED_LIBRARIES := libui
+LOCAL_MODULE := libshim_camera
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
+
 # IMS
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := MediaBuffer.c
diff --git a/libshims/GraphicBuffer.cpp b/libshims/GraphicBuffer.cpp
new file mode 100644
index 0000000..b939f4a
--- /dev/null
+++ b/libshims/GraphicBuffer.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+
+// GraphicBuffer(uint32_t inWidth, uint32_t inHeight, PixelFormat inFormat,
+//               uint32_t inUsage, std::string requestorName = "<Unknown>");
+extern "C" void _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE(
+    uint32_t inWidth, uint32_t inHeight, int inFormat, uint32_t inUsage,
+    std::string requestorName);
+
+extern "C" void _ZN7android19IGraphicBufferAllocD0Evj(
+    uint32_t inWidth, uint32_t inHeight, int inFormat, uint32_t inUsage,
+    std::string requestorName);
+
+//libmot_gpu_mapper.so
+extern "C" void _ZN7android13GraphicBufferC1Ejjij(
+    uint32_t inWidth, uint32_t inHeight, int inFormat, uint32_t inUsage) {
+  std::string requestorName = "<Unknown>";
+  _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE(
+      inWidth, inHeight, inFormat, inUsage, requestorName);
+}
+
+extern "C" void _ZN7android19IGraphicBufferAllocD0Ev(
+    uint32_t inWidth, uint32_t inHeight, int inFormat, uint32_t inUsage) {
+    std::string requestorName = "<Unknown>";
+	//_ZN7android19IGraphicBufferAllocD0Evj(inWidth, inHeight, inFormat, inUsage, requestorName);
+}
+
+extern "C" void _ZN7android19IGraphicBufferAlloc10descriptorE() {}
+
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index adf4dea..291e2bd 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -57,7 +57,7 @@ on fs
 
 on init
     # Symbols required for motorola blobs
-    export LD_SHIM_LIBS /system/vendor/lib/lib-imsvt.so|libshim_ims.so:/system/vendor/bin/adspd|libshim_adsp.so:/system/vendor/lib/libizat_core.so|libshims_get_process_name.so:/system/vendor/lib/libril-qc-qmi-1.so|rild_socket.so:/system/lib/libandroid.so|libshim_ril.so:/system/lib/lib_motsensorlistener.so|libsensor.so:/system/lib/libjustshoot.so|libshims_camera.so:/system/vendor/lib/libmmcamera2_stats_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_sensor_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_imglib_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_iface_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_q3a_core.so|libsensor.so:/system/vendor/lib/libmmcamera2_mct.so|libsensor.so:/system/vendor/lib/libmmcamera_imglib.so|libsensor.so
+    export LD_SHIM_LIBS /system/vendor/lib/lib-imsvt.so|libshim_ims.so:/system/vendor/bin/adspd|libshim_adsp.so:/system/vendor/lib/libizat_core.so|libshims_get_process_name.so:/system/vendor/lib/libril-qc-qmi-1.so|rild_socket.so:/system/lib/libandroid.so|libshim_ril.so:/system/lib/lib_motsensorlistener.so|libsensor.so:/system/vendor/lib/libmot_gpu_mapper.so|libshim_camera.so:/system/lib/libjustshoot.so|libshims_camera.so:/system/vendor/lib/libmmcamera2_stats_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_sensor_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_imglib_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_iface_modules.so|libsensor.so:/system/vendor/lib/libmmcamera2_q3a_core.so|libsensor.so:/system/vendor/lib/libmmcamera2_mct.so|libsensor.so:/system/vendor/lib/libmmcamera_imglib.so|libsensor.so
 
     write /sys/module/qpnp_rtc/parameters/poweron_alarm 1