From 7f0758f0ae147e0c1d69286445b4aae0c7383771 Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Wed, 21 Jun 2017 16:54:32 -0600
Subject: [PATCH] android: Rename librenderdoc to libVkLayer_GLES_Renderdoc

This allows the library to be used as a Vulkan layer and shared
object for GLES debugging.  It was already being renamed in the
distribution scripts.  We've been renaming by hand for local
Vulkan development.
---
 renderdoccmd/CMakeLists.txt                                   | 2 +-
 .../android/src/org/renderdoc/renderdoccmd/Loader.java        | 2 +-
 scripts/dist.sh                                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index 287c216c7..388501fb6 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -68,7 +68,7 @@ if(ANDROID)
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/android ${CMAKE_CURRENT_BINARY_DIR}
                        COMMAND ${CMAKE_COMMAND} -E make_directory libs/${ANDROID_ABI}
-                       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoc> libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:renderdoc>
+                       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoc> libs/${ANDROID_ABI}/libVkLayer_GLES_RenderDoc.so
                        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoccmd> libs/${ANDROID_ABI}/$<TARGET_FILE_NAME:renderdoccmd>
                        COMMAND android update project --path . --name RenderDocCmd --target ${APK_TARGET_ID}
                        COMMAND ant debug
diff --git a/renderdoccmd/android/src/org/renderdoc/renderdoccmd/Loader.java b/renderdoccmd/android/src/org/renderdoc/renderdoccmd/Loader.java
index 9c226ce1a..3699b3737 100644
--- a/renderdoccmd/android/src/org/renderdoc/renderdoccmd/Loader.java
+++ b/renderdoccmd/android/src/org/renderdoc/renderdoccmd/Loader.java
@@ -5,7 +5,7 @@ public class Loader extends android.app.NativeActivity
 {
     /* load our native library */
     static {
-        System.loadLibrary("renderdoc");
+        System.loadLibrary("VkLayer_GLES_RenderDoc");
     }
 
     @Override
diff --git a/scripts/dist.sh b/scripts/dist.sh
index 618507ede..ce055d4c3 100644
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -65,7 +65,7 @@ if [ -f bin-android32/RenderDocCmd.apk ]; then
 	mkdir -p dist/Release64/android/apk dist/Release64/android/lib/armeabi-v7a
 
 	cp bin-android32/RenderDocCmd.apk dist/Release64/android/apk
-	cp bin-android32/librenderdoc.so dist/Release64/android/lib/armeabi-v7a/libVkLayer_RenderDoc.so
+	cp bin-android32/libVkLayer_GLES_RenderDoc.so dist/Release64/android/lib/armeabi-v7a/libVkLayer_GLES_RenderDoc.so
 fi
 
 if [ -f bin-android64/RenderDocCmd.apk ]; then
@@ -75,7 +75,7 @@ if [ -f bin-android64/RenderDocCmd.apk ]; then
 	mkdir -p dist/Release64/android/lib/arm64-v8a
 
 	#cp bin-android64/RenderDocCmd.apk dist/Release64/android/apk/64
-	cp bin-android64/librenderdoc.so dist/Release64/android/lib/arm64-v8a/libVkLayer_RenderDoc.so
+	cp bin-android64/libVkLayer_GLES_RenderDoc.so dist/Release64/android/lib/arm64-v8a/libVkLayer_GLES_RenderDoc.so
 fi
 
 # try to copy adb.exe in as well, with its dll dependencies