lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-26 16:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: Rename librenderdoc to libVkLayer_GLES_Renderdoc

Browse Source 
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.
This commit is contained in:
Cody Northrop
2017-07-21 10:29:46 -07:00
committed by Baldur Karlsson
parent c735a30750
commit 7f0758f0ae
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/CMakeLists.txt
+1 -1
View File
@@ -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
renderdoccmd/android/src/org/renderdoc/renderdoccmd/Loader.java
+1 -1
View File
@@ -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
scripts/dist.sh
+2 -2
View File
@@ -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