From 75d7390a942f535a34c3cea494b5d0a1eb9911f3 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Sun, 24 Apr 2016 18:31:44 +0300 Subject: [PATCH] Rollback: set permissions via 'chmod' --- .../kotlin/android/tests/run/PermissionManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 c4e1bc5148f..e3e09db0447 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 @@ -32,6 +32,7 @@ public class PermissionManager { RunUtils.execute(generateChmodCmd(pathManager.getAntBinDirectory() + "/ant")); setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk())); setExecPermissionForSimpleNamedFiles(new File(pathManager.getBuildToolsFolderInAndroidSdk() + "/" + SDKDownloader.BUILD_TOOLS)); + setExecPermissionForSimpleNamedFiles(new File(pathManager.getPlatformToolsFolderInAndroidSdk())); } } @@ -40,7 +41,7 @@ public class PermissionManager { if (files != null) { for (File file : files) { if (file.isFile() && !file.getName().contains(".")) { - file.setExecutable(true); + RunUtils.execute(generateChmodCmd(file.getAbsolutePath())); } } } @@ -49,7 +50,7 @@ public class PermissionManager { private static GeneralCommandLine generateChmodCmd(String path) { GeneralCommandLine commandLine = new GeneralCommandLine(); commandLine.setExePath("chmod"); - commandLine.addParameter("u+x"); + commandLine.addParameter("a+x"); commandLine.addParameter(path); return commandLine; }