From b3245e9cf6452e799dddcec85ae46b6d8b8d1ea8 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 30 Jun 2015 16:27:57 -0700
Subject: androidbp: simplify translation by evaluating all expressions in
 Blueprint

Translation is getting complicated because the expressions supported
by Blueprint are difficult to support in Make.  Modify androidbp
to use context aware parsing so it can evaluate all expressions at
parse time, so it only needs to deal with constant values.

Change-Id: I57047645fb48475baecd0361f78a93ec0a26011e
---
 common/defs.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'common/defs.go')

diff --git a/common/defs.go b/common/defs.go
index 98464fef..f5b02fe5 100644
--- a/common/defs.go
+++ b/common/defs.go
@@ -27,10 +27,12 @@ var (
 	cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks",
 		Config.CpPreserveSymlinksFlags)
 
+	srcDir = pctx.VariableConfigMethod("srcDir", Config.SrcDir)
+
 	androidbpCmd = filepath.Join(bootstrap.BinDir, "androidbp")
 	androidbp    = pctx.StaticRule("androidbp",
 		blueprint.RuleParams{
-			Command:     androidbpCmd + " $in $out",
+			Command:     androidbpCmd + " ${srcDir}/Android.bp $in $out",
 			Description: "androidbp $out",
 		})
 
-- 
cgit v1.2.3