Snap for 10957012 from 92b51f2bbbab9f9b99ebf30dc102bb0b0f46a4bb to simpleperf-release

Change-Id: Ic06b4b985c2a0d32e984aebc2115668b37c29fc4

4 files changed, 69 insertions, 13 deletions

diff --git a/METADATA b/METADATA
index 3814b8d..f4495f2 100644
--- a/METADATA
+++ b/METADATA
@@ -2,5 +2,6 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "OEM proprietary"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/binaries/gpu/Android.bp b/binaries/gpu/Android.bp
new file mode 100644
index 0000000..8423c3f
--- /dev/null
+++ b/binaries/gpu/Android.bp
@@ -0,0 +1,57 @@
+
+
+install_symlink {
+    name: "yukawa_libGLES_mali_vulkan_symlink32",
+    vendor: true,
+    installed_location: "lib/hw/vulkan.yukawa.so",
+    symlink_target: "../egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_vulkan_symlink64",
+    vendor: true,
+    installed_location: "lib64/hw/vulkan.yukawa.so",
+    symlink_target: "../egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so.1",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so.1.1",
+    symlink_target: "egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so.1",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so.1.1",
+    symlink_target: "egl/libGLES_mali.so",
+}
\ No newline at end of file
diff --git a/binaries/gpu/Android.mk b/binaries/gpu/Android.mk
index f989461..63de7e5 100755
--- a/binaries/gpu/Android.mk
+++ b/binaries/gpu/Android.mk
@@ -35,19 +35,17 @@ LOCAL_SHARED_LIBRARIES := android.hardware.graphics.common@1.0 libz libnativewin
 LOCAL_STRIP_MODULE := false
 
 ifeq ($(BOARD_INSTALL_VULKAN),true)
-LOCAL_POST_INSTALL_CMD = $(hide) \
-    pushd $(dir $(LOCAL_INSTALLED_MODULE))../hw && \
-        ln -sf ../egl/$(notdir $(LOCAL_INSTALLED_MODULE)) vulkan.$(TARGET_DEVICE).so && \
-        popd;
+LOCAL_REQUIRED_MODULES += yukawa_libGLES_mali_vulkan_symlink32 yukawa_libGLES_mali_vulkan_symlink64
 endif
 
 ifeq ($(BOARD_INSTALL_OPENCL),true)
-LOCAL_POST_INSTALL_CMD += \
-    pushd $(dir $(LOCAL_INSTALLED_MODULE)).. && \
-        ln -sf egl/$(notdir $(LOCAL_INSTALLED_MODULE)) libOpenCL.so.1.1 && \
-        ln -sf libOpenCL.so.1.1 libOpenCL.so.1 && \
-        ln -sf libOpenCL.so.1.1 libOpenCL.so && \
-        popd;
+LOCAL_REQUIRED_MODULES += \
+    yukawa_libGLES_mali_libOpenCL_symlink32 \
+    yukawa_libGLES_mali_libOpenCL.1_symlink32 \
+    yukawa_libGLES_mali_libOpenCL.1.1_symlink32 \
+    yukawa_libGLES_mali_libOpenCL_symlink64 \
+    yukawa_libGLES_mali_libOpenCL.1_symlink64 \
+    yukawa_libGLES_mali_libOpenCL.1.1_symlink64
 endif
 
 include $(BUILD_PREBUILT)
diff --git a/hal/gralloc/mali_gralloc_debug.cpp b/hal/gralloc/mali_gralloc_debug.cpp
index d4473ed..3737fbc 100644
--- a/hal/gralloc/mali_gralloc_debug.cpp
+++ b/hal/gralloc/mali_gralloc_debug.cpp
@@ -120,7 +120,7 @@ void mali_gralloc_dump_internal(uint32_t *outSize, char *outBuffer)
 
 	if (NULL == outBuffer)
 	{
-		if (!dumpStrings.isEmpty())
+		if (!dumpStrings.empty())
 		{
 			dumpStrings.clear();
 		}
@@ -129,7 +129,7 @@ void mali_gralloc_dump_internal(uint32_t *outSize, char *outBuffer)
 	}
 	else
 	{
-		if (dumpStrings.isEmpty())
+		if (dumpStrings.empty())
 		{
 			*outSize = 0;
 		}
@@ -137,7 +137,7 @@ void mali_gralloc_dump_internal(uint32_t *outSize, char *outBuffer)
 		{
 			dumpSize = dumpStrings.size();
 			*outSize = (dumpSize < *outSize) ? dumpSize : *outSize;
-			memcpy(outBuffer, dumpStrings.string(), *outSize);
+			memcpy(outBuffer, dumpStrings.c_str(), *outSize);
 		}
 	}
 }