From 83697f4e856429509eed33bc31cf2189dde96032 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Mon, 18 Sep 2017 23:40:10 -0600 Subject: [PATCH] android: Update server installation to allow 64-bit This allows local arm64 builds, and should continue to work for stable releases only containing arm32. This also adds the "-g" flag to the install, granting all requested runtime permissions, simplifying the user experience. --- renderdoc/core/android.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/renderdoc/core/android.cpp b/renderdoc/core/android.cpp index def18b91d..4acbe7171 100644 --- a/renderdoc/core/android.cpp +++ b/renderdoc/core/android.cpp @@ -553,7 +553,10 @@ bool installRenderDocServer(const string &deviceID) abi_string_map["mips64"] = Android_mips64; // clang-format on - // 32-bit server works for 32 and 64 bit apps, so install 32-bit matching ABI + // 32-bit server works for 32 and 64 bit apps + // For stable builds of the server, only 32-bit libs will be packaged into APK + // For local builds, whatever was specified as single ABI will be packaged into APK + string adbAbi = trim(adbExecCommand(deviceID, "shell getprop ro.product.cpu.abi").strStdout); string adbInstall; @@ -561,7 +564,7 @@ bool installRenderDocServer(const string &deviceID) { case Android_armeabi_v7a: case Android_arm64_v8a: - adbInstall = adbExecCommand(deviceID, "install -r --abi armeabi-v7a " + serverApk).strStdout; + adbInstall = adbExecCommand(deviceID, "install -r -g " + serverApk).strStdout; break; case Android_armeabi: case Android_x86: