From fbbb614e804ddf063b6952a0cd0d3d4e25e4ce93 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 22 Apr 2016 12:59:58 +0300 Subject: [PATCH] PermissionManager updated to new android tools structure --- .../android/tests/run/PermissionManager.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java index e09bba1868e..c4e1bc5148f 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java @@ -19,6 +19,9 @@ package org.jetbrains.kotlin.android.tests.run; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.kotlin.android.tests.PathManager; +import org.jetbrains.kotlin.android.tests.download.SDKDownloader; + +import java.io.File; public class PermissionManager { private PermissionManager() { @@ -26,15 +29,20 @@ public class PermissionManager { public static void setPermissions(PathManager pathManager) { if (!SystemInfo.isWindows) { - RunUtils.execute(generateChmodCmd(pathManager.getPlatformToolsFolderInAndroidSdk() + "/aapt")); - RunUtils.execute(generateChmodCmd(pathManager.getPlatformToolsFolderInAndroidSdk() + "/adb")); - RunUtils.execute(generateChmodCmd(pathManager.getPlatformToolsFolderInAndroidSdk() + "/dx")); - RunUtils.execute(generateChmodCmd(pathManager.getToolsFolderInAndroidSdk() + "/emulator")); - RunUtils.execute(generateChmodCmd(pathManager.getToolsFolderInAndroidSdk() + "/ddms")); - RunUtils.execute(generateChmodCmd(pathManager.getToolsFolderInAndroidSdk() + "/android")); - RunUtils.execute(generateChmodCmd(pathManager.getToolsFolderInAndroidSdk() + "/emulator-arm")); - RunUtils.execute(generateChmodCmd(pathManager.getToolsFolderInAndroidSdk() + "/zipalign")); RunUtils.execute(generateChmodCmd(pathManager.getAntBinDirectory() + "/ant")); + setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk())); + setExecPermissionForSimpleNamedFiles(new File(pathManager.getBuildToolsFolderInAndroidSdk() + "/" + SDKDownloader.BUILD_TOOLS)); + } + } + + private static void setExecPermissionForSimpleNamedFiles(File folder) { + File[] files = folder.listFiles(); + if (files != null) { + for (File file : files) { + if (file.isFile() && !file.getName().contains(".")) { + file.setExecutable(true); + } + } } }