diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-08 18:41:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-08 18:41:34 +0000 |
| commit | 2def8cc8bac8058d4c48c3033889315c3c006404 (patch) | |
| tree | 91c2efa25db6d470beb69de70f5d0e2b8750b07d | |
| parent | 8a3bfe96ee9c9a0bbb5c03039d9f4fbf90c99e98 (diff) | |
| parent | 2673a7a30469bedd390f1db7ca3263fc408a991b (diff) | |
| download | clang-2def8cc8bac8058d4c48c3033889315c3c006404.tar.gz | |
Merge "Change bool, and string properties to *bool, and *string for cc"
| -rw-r--r-- | soong/clang.go | 4 | ||||
| -rw-r--r-- | soong/tblgen.go | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/soong/clang.go b/soong/clang.go index ed3f0fc49e..cd2838b8d5 100644 --- a/soong/clang.go +++ b/soong/clang.go @@ -37,7 +37,7 @@ func clangForceBuildLlvmComponents(ctx android.LoadHookContext) { } Multilib struct { Lib32 struct { - Suffix string + Suffix *string } } } @@ -45,7 +45,7 @@ func clangForceBuildLlvmComponents(ctx android.LoadHookContext) { if ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_COMPONENTS") { p.Target.Host.Compile_multilib = proptools.StringPtr("both") - p.Multilib.Lib32.Suffix = "_32" + p.Multilib.Lib32.Suffix = proptools.StringPtr("_32") } ctx.AppendProperties(p) diff --git a/soong/tblgen.go b/soong/tblgen.go index bf5c1a4532..2d00c20509 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(), |