aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdklib
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-04-16 11:06:43 -0700
committerRaphael Moll <ralf@android.com>2012-04-16 13:54:56 -0700
commit86f8b11eb187eae363a933f8ef3bb7ef8de0e489 (patch)
tree0c37a41f9708808ee6e5e92e85218396bf2f4895 /sdkmanager/libs/sdklib
parentad0111a77b0f0908cc945dc6e8e8949b75cb8886 (diff)
downloadsdk-86f8b11eb187eae363a933f8ef3bb7ef8de0e489.zip
sdk-86f8b11eb187eae363a933f8ef3bb7ef8de0e489.tar.gz
sdk-86f8b11eb187eae363a933f8ef3bb7ef8de0e489.tar.bz2
SDK: change proguard.config for Windows.
Change the default to use / dir-separators even for the Windows template. The / will be correctly replaced by \\ by both Ant and our ExportHelper, ensuring a relative path works on all platforms. SDK bug: 28860 (This does not solve the path-separator issue with ; vs : on Windows. That will be addressed later.) Change-Id: Iee3ae9c58aa606aee7943c4e20643164bbf7344b
Diffstat (limited to 'sdkmanager/libs/sdklib')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
index 2bb6b71..33f56ce 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
@@ -29,7 +29,6 @@ import com.android.sdklib.ISdkLog;
import com.android.sdklib.SdkConstants;
import java.io.BufferedReader;
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -186,8 +185,10 @@ public class ProjectProperties {
"#\n" +
"# To enable ProGuard to shrink and obfuscate your code, uncomment this "
+ "(available properties: sdk.dir, user.home):\n" +
- "#" + PROPERTY_PROGUARD_CONFIG + "=${" + PROPERTY_SDK +"}" + File.separator
- + FD_TOOLS + File.separator + FD_PROGUARD + File.separator
+ // Note: always use / separators in the properties paths. Both Ant and
+ // our ExportHelper will convert them properly according to the platform.
+ "#" + PROPERTY_PROGUARD_CONFIG + "=${" + PROPERTY_SDK +"}/"
+ + FD_TOOLS + '/' + FD_PROGUARD + '/'
+ FN_ANDROID_PROGUARD_FILE + ':' + FN_PROJECT_PROGUARD_FILE +'\n' +
"\n";