Merge "Fix exception in MakeFileParser"

2015-12-09 19:11:13 +00:00
parent a3a48fc603 0b7e903d4c
commit 85fad37aa7
1 changed files with 2 additions and 2 deletions
--- a/tools/idegen/src/com/android/idegen/MakeFileParser.java
+++ b/tools/idegen/src/com/android/idegen/MakeFileParser.java
@@ -174,7 +174,7 @@ public class MakeFileParser {

        private String findVariables(String value) {

-            int variableStart = value.indexOf('$');
+            int variableStart = value.indexOf("$(");
            // Keep going until we substituted all variables.
            while (variableStart > -1) {
                StringBuilder sb = new StringBuilder();
@@ -193,7 +193,7 @@ public class MakeFileParser {
                    sb.append(value.substring(variableEnd + 1));
                }
                value = sb.toString();
-                variableStart = value.indexOf('$');
+                variableStart = value.indexOf("$(");
            }
            return value;
        }