diff options
author | Xavier Ducrohet <xav@android.com> | 2012-04-16 18:06:52 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2012-04-17 13:54:01 -0700 |
commit | 9ae013cdfed27c90306d7f8d426be6d34d369ad2 (patch) | |
tree | fe86b654b4534141d00945d24c51ed9b06ef0b35 /sdkmanager/libs/sdklib | |
parent | 536c05c1a50cafea74ce637d6c4030b1235a0111 (diff) | |
download | sdk-9ae013cdfed27c90306d7f8d426be6d34d369ad2.zip sdk-9ae013cdfed27c90306d7f8d426be6d34d369ad2.tar.gz sdk-9ae013cdfed27c90306d7f8d426be6d34d369ad2.tar.bz2 |
Fix lib properties on windows.
This is a very crude first fix while we figure out
how to properly escape/unescape all chars.
Change-Id: I783f8fdfd802e1a8ff44bbc7f6056fb607a3e523
Diffstat (limited to 'sdkmanager/libs/sdklib')
2 files changed, 10 insertions, 4 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 09a35c5..9d578c4 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 @@ -394,7 +394,7 @@ public class ProjectProperties implements IPropertySource { Matcher m = PATTERN_PROP.matcher(line); if (m.matches()) { - map.put(m.group(1), m.group(2)); + map.put(m.group(1), unescape(m.group(2))); } else { log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax", propFile.getOsLocation(), @@ -430,7 +430,6 @@ public class ProjectProperties implements IPropertySource { return null; } - /** * Private constructor. * <p/> @@ -443,4 +442,12 @@ public class ProjectProperties implements IPropertySource { mProperties = map; mType = type; } + + private static String unescape(String value) { + return value.replaceAll("\\\\\\\\", "\\\\"); + } + + protected static String escape(String value) { + return value.replaceAll("\\\\", "\\\\\\\\"); + } } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java index 797b505..2d3f9b7 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectPropertiesWorkingCopy.java @@ -226,8 +226,7 @@ public class ProjectPropertiesWorkingCopy extends ProjectProperties { } } - value = value.replaceAll("\\\\", "\\\\\\\\"); - writer.write(String.format("%s=%s\n", key, value)); + writer.write(String.format("%s=%s\n", key, escape(value))); } /** |