From 2ee10a0659406495e118c17ed20a7c4064a9da7a Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 21 Nov 2016 17:22:15 -0800
Subject: [PATCH] genrule: expand $$ to $$

An escaped $ sign in an expanded string needs to be re-escaped so it
can pass through to ninja.

Test: m -j libLLVMObject
Change-Id: I2f7890417fd6f534e6e21cace3d86ae9ef708ce5
---
 android/expand.go      | 2 +-
 android/expand_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/expand.go b/android/expand.go
index 101318108..527c4ac6d 100644
--- a/android/expand.go
+++ b/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 {
diff --git a/android/expand_test.go b/android/expand_test.go
index ca50b3982..128de8a4e 100644
--- a/android/expand_test.go
+++ b/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:  "$(💩)",