Update some shims for P

BoardConfigCommon.mk

@@ -38,6 +38,8 @@ TARGET_THERMALHAL_VARIANT := tegra
 # Release tools for bootloader assertion
 TARGET_RELEASETOOLS_EXTENSIONS := device/nvidia/shield-common/releasetools
 
+TARGET_LD_SHIM_LIBS := /vendor/lib/hw/audio.primary.tegra.so|libicu_shim.so
+
 # Use unified vendor
 TARGET_TEGRA_VARIANT := shield
 

shield.mk

@@ -119,6 +119,9 @@ PRODUCT_PACKAGES += \
     libstagefrighthw \
     enctune.conf
 
+# Audio shim
+PRODUCT_PACKAGES += libicu_shim
+
 # Bluetooth
 PRODUCT_PACKAGES += \
     libbt-vendor \

shims/Android.mk

 LOCAL_PATH:= $(call my-dir)
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := icu_shim.c
+LOCAL_SHARED_LIBRARIES := libicuuc libicui18n
+LOCAL_MULTILIB := 32
+LOCAL_MODULE := libicu_shim
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := socket_loopback_client.c
 LOCAL_SHARED_LIBRARIES := libcutils
@@ -10,7 +18,10 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := stdio_vsnprintf.cpp
-LOCAL_C_INCLUDES := bionic/libc/stdio
+LOCAL_C_INCLUDES := \
+    bionic/libc \
+    bionic/libc/stdio \
+    bionic/libc/async_safe/include
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE := libs
 LOCAL_MODULE_TAGS := optional

shims/icu_shim.c

+#include "unicode/ucnv.h"
+
+U_STABLE UConverter* U_EXPORT2
+ucnv_open_58(const char *converterName, UErrorCode *err)
+{
+    return ucnv_open(converterName, err);
+}
+
+U_STABLE void  U_EXPORT2
+ucnv_close_58(UConverter * converter)
+{
+    return ucnv_close(converter);
+}
+
+U_STABLE void U_EXPORT2 UCNV_TO_U_CALLBACK_STOP_58(
+                  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_58(
+                  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_58(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_58(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_58(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);
+}

shims/stdio_vsnprintf.cpp

@@ -4,8 +4,6 @@
 
 #include <cutils/log.h>
 
-#include "local.h"
-
 static typeof(vsnprintf) *vsnprintf_real = NULL;
 
 extern "C" int haxprintf(char* s, size_t n, const char* fmt, va_list ap) {