aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNan Zhang <nanzhang@google.com>2017-11-08 18:57:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-08 18:57:06 +0000
commita7872c69cea3ef0e4f23ac42801e38916778d07b (patch)
treeba93efddb656be745c4b88e20ba87821ce1060d1
parentb407eb3c230d0fa64f1c7f214fe8bfc3d7e2dead (diff)
parent2c584801fc785905758e70e54ee690c0abdc181a (diff)
downloadllvm-a7872c69cea3ef0e4f23ac42801e38916778d07b.tar.gz
Merge "Change bool, and string properties to *bool, and *string for cc" am: 7693cd9c5d
am: 2c584801fc Change-Id: I94c0c889af60466de084220cffd068a85616401f
-rw-r--r--soong/tblgen.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/soong/tblgen.go b/soong/tblgen.go
index ac7a34389066..825da95040d8 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -22,6 +22,7 @@ import (
"android/soong/genrule"
"github.com/google/blueprint"
+ "github.com/google/blueprint/proptools"
)
func init() {
@@ -43,7 +44,7 @@ var (
)
type tblgenProperties struct {
- In string
+ In *string
Outs []string
}
@@ -59,7 +60,7 @@ type tblgen struct {
var _ genrule.SourceFileGenerator = (*tblgen)(nil)
func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
- in := android.PathForModuleSrc(ctx, t.properties.In)
+ in := android.PathForModuleSrc(ctx, proptools.String(t.properties.In))
includes := []string{
"-I " + ctx.ModuleDir(),