potter: update shims

Change-Id: Ic857cb87cd380c54c4898e2ef010ecf865283808

device.mk

@@ -102,7 +102,9 @@ PRODUCT_PACKAGES += \
     libshim_camera \
     Snap \
     camera.device@3.2-impl \
-    android.hardware.camera.provider@2.4-impl
+    android.hardware.camera.provider@2.4-impl \
+    libshim_camera_hal \
+    libshims_camera
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/camera/msm8953_mot_potter_camera.xml:system/etc/camera/msm8953_mot_potter_camera.xml \

libshims/Android.mk

@@ -41,19 +41,39 @@ LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES := get_process_name.c
-
 LOCAL_MODULE := libshims_get_process_name
 LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := rild_socket.c
+LOCAL_MODULE := rild_socket
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
+LOCAL_SRC_FILES := DisplayEventReceiver.c
+LOCAL_MODULE := libshim_camera_hal
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
 
-LOCAL_SRC_FILES := rild_socket.c
+include $(CLEAR_VARS)
 
-LOCAL_MODULE := rild_socket
+LOCAL_SRC_FILES := MediaCodec.cpp
+
+LOCAL_SHARED_LIBRARIES := libstagefright libmedia
+
+LOCAL_MODULE := libshims_camera
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
+
+# RIL
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := sensor.cpp
+LOCAL_SHARED_LIBRARIES := libgui libsensor
+LOCAL_MODULE := libshim_ril
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)

libshims/DisplayEventReceiver.c

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+/* TODO: Actually provide implementations for these function! */
+
+void _ZN7android20DisplayEventReceiverC1Ev() {}

libshims/GraphicBuffer.cpp

@@ -22,6 +22,10 @@ extern "C" void _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11ch
     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) {
@@ -29,3 +33,12 @@ extern "C" void _ZN7android13GraphicBufferC1Ejjij(
   _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() {}
+

libshims/MediaCodec.cpp

@@ -0,0 +1,26 @@
+#include <media/MediaCodecBuffer.h>
+#include <media/stagefright/foundation/AHandler.h>
+#include <utils/Vector.h>
+
+namespace android {
+
+extern "C" void _ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPiij(
+	const sp<ALooper> &looper, const AString &mime, bool encoder, status_t *err, pid_t pid, uid_t uid);
+
+extern "C" void _ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(Vector<sp<ABuffer> > *buffers);
+extern "C" void _ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(Vector<sp<ABuffer> > *buffers);
+
+extern "C" void _ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPii(
+	const sp<ALooper> &looper, const AString &mime, bool encoder, status_t *err, pid_t pid) {
+	_ZN7android10MediaCodec12CreateByTypeERKNS_2spINS_7ALooperEEERKNS_7AStringEbPiij(
+		looper, mime, encoder, err, pid, 0);
+}
+
+extern "C" void _ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_7ABufferEEEEE(Vector<sp<ABuffer> > *buffers) {
+	_ZNK7android10MediaCodec15getInputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(buffers);
+}
+
+extern "C" void _ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_7ABufferEEEEE(Vector<sp<ABuffer> > *buffers) {
+	_ZNK7android10MediaCodec16getOutputBuffersEPNS_6VectorINS_2spINS_16MediaCodecBufferEEEEE(buffers);
+}
+}

libshims/sensor.cpp

@@ -0,0 +1,22 @@
+/*
+ * 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.
+ * 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 <sensor/Sensor.h>
+
+extern "C" int ASensor_getHandle(ASensor const* sensor)
+{
+    return static_cast<android::Sensor const*>(sensor)->getHandle();
+}