lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to no longer used android files

Browse Source
This commit is contained in:
baldurk
2023-08-29 10:44:53 +01:00
parent 788a0ca98f
commit 2d41648d4d
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/buildscripts/scripts/make_package_win32.sh
-7
View File
@@ -78,13 +78,6 @@ else
echo " distributed android SDK due to licensing concerns.";
fi
# Generate a debug key for signing purposes
if [ -f "$JAVA_HOME/bin/keytool.exe" ] && [ -d dist/Release64/plugins/android ]; then
"$JAVA_HOME/bin/keytool.exe" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias rdocandroidkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C="
elif [ -f "$JAVA_HOME/bin/keytool" ] && [ -d dist/Release64/plugins/android ]; then
"$JAVA_HOME/bin/keytool" -genkey -keystore dist/Release64/plugins/android/renderdoc.keystore -storepass android -alias rdocandroidkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=, OU=, O=, L=, S=, C="
fi
if [ -d dist/Release64/plugins/android ]; then
cp -R dist/Release64/plugins/android dist/Release32/plugins/
fi
util/installer/Installer32.wxs
-4
View File
@@ -196,13 +196,9 @@
<Component Id='android_plugin' Guid='D469744A-7915-46B8-88B4-4B76223EE8CB'>
<File Id='APKarm32' Name='org.renderdoc.renderdoccmd.arm32.apk' DiskId='1' Source='dist/Release32/plugins/android/org.renderdoc.renderdoccmd.arm32.apk' KeyPath='yes' />
<File Id='APKarm64' Name='org.renderdoc.renderdoccmd.arm64.apk' DiskId='1' Source='dist/Release32/plugins/android/org.renderdoc.renderdoccmd.arm64.apk' />
<File Id='aapt' Name='aapt.exe' DiskId='1' Source='dist/Release32/plugins/android/aapt.exe' />
<File Id='adb' Name='adb.exe' DiskId='1' Source='dist/Release32/plugins/android/adb.exe' />
<File Id='AdbWinApi' Name='AdbWinApi.dll' DiskId='1' Source='dist/Release32/plugins/android/AdbWinApi.dll' />
<File Id='AdbWinUsbApi' Name='AdbWinUsbApi.dll' DiskId='1' Source='dist/Release32/plugins/android/AdbWinUsbApi.dll' />
<File Id='apksigner' Name='apksigner.jar' DiskId='1' Source='dist/Release32/plugins/android/apksigner.jar' />
<File Id='keystore' Name='renderdoc.keystore' DiskId='1' Source='dist/Release32/plugins/android/renderdoc.keystore' />
<File Id='zipalign' Name='zipalign.exe' DiskId='1' Source='dist/Release32/plugins/android/zipalign.exe' />
</Component>
</Directory>
util/installer/Installer64.wxs
-4
View File
@@ -193,13 +193,9 @@
<Component Id='android_plugin' Win64="yes" Guid='328B7D53-1323-4D9B-8966-3D8567E3723B'>
<File Id='APKarm32' Name='org.renderdoc.renderdoccmd.arm32.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm32.apk' KeyPath='yes' />
<File Id='APKarm64' Name='org.renderdoc.renderdoccmd.arm64.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm64.apk' />
<File Id='aapt' Name='aapt.exe' DiskId='1' Source='dist/Release64/plugins/android/aapt.exe' />
<File Id='adb' Name='adb.exe' DiskId='1' Source='dist/Release64/plugins/android/adb.exe' />
<File Id='AdbWinApi' Name='AdbWinApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinApi.dll' />
<File Id='AdbWinUsbApi' Name='AdbWinUsbApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinUsbApi.dll' />
<File Id='apksigner' Name='apksigner.jar' DiskId='1' Source='dist/Release64/plugins/android/apksigner.jar' />
<File Id='keystore' Name='renderdoc.keystore' DiskId='1' Source='dist/Release64/plugins/android/renderdoc.keystore' />
<File Id='zipalign' Name='zipalign.exe' DiskId='1' Source='dist/Release64/plugins/android/zipalign.exe' />
</Component>
</Directory>