Merge "genrule: expand $$ to $$" am: d328ad708e am: a14071cf6c

am: 88c9ef3737

Change-Id: I65995c5cbf450910e6219089a993e94fa360bb22

android/expand.go

@@ -57,7 +57,7 @@ func getMapping(s string, mapping func(string) (string, error)) (string, int, er
 		}
 		return "", len(s), fmt.Errorf("missing )")
 	case '$':
-		return s[0:1], 1, nil
+		return "$$", 1, nil
 	default:
 		i := strings.IndexFunc(s, unicode.IsSpace)
 		if i == 0 {

android/expand_test.go

@@ -85,19 +85,19 @@ var expandTestCases = []struct {
 	},
 	{
 		in:  "$$",
-		out: "$",
+		out: "$$",
 	},
 	{
 		in:  "$$(var1)",
-		out: "$(var1)",
+		out: "$$(var1)",
 	},
 	{
 		in:  "$$$(var1)",
-		out: "$abc",
+		out: "$$abc",
 	},
 	{
 		in:  "$(var1)$$",
-		out: "abc$",
+		out: "abc$$",
 	},
 	{
 		in:  "$(💩)",