aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-08-27 13:28:01 -0700
committerColin Cross <ccross@android.com>2015-09-14 16:09:36 -0700
commit485e572aeb8690abcb2907149f01f25fc85394db (patch)
treeccf07658ee2e360c23dd733efe5e5b484d76671c /cmd
parent7f64b6de3156da72cb310c0d16083e5e36481e48 (diff)
downloadbuild_soong-485e572aeb8690abcb2907149f01f25fc85394db.tar.gz
build_soong-485e572aeb8690abcb2907149f01f25fc85394db.tar.bz2
build_soong-485e572aeb8690abcb2907149f01f25fc85394db.zip
Read product variables from soong.variables
Refactor the soong.config loading code to support reading in product variables from soong.variables. Change-Id: I389e6bb5c501b53167267d5f5d0d25557811cf72
Diffstat (limited to 'cmd')
-rw-r--r--cmd/soong_build/main.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 94fb6e74..33fdd698 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -49,5 +49,5 @@ func main() {
// Temporary hack
//ctx.SetIgnoreUnknownModuleTypes(true)
- bootstrap.Main(ctx, configuration, common.ConfigFileName)
+ bootstrap.Main(ctx, configuration, common.ConfigFileName, common.ProductVariablesFileName)
}