Change bool, and string properties to *bool, and *string for cc
there's no use case for prepending/appending to bool, and string
properties within module struct. Declearing "*bool" and "*string" almost
cover everything user need.
Test: m -j checkbuild
Bug: b/68853585
Change-Id: Ic2bcb35df817220f86501ed0d24000ff3d177af3
diff --git a/soong/clang.go b/soong/clang.go
index ed3f0fc..cd2838b 100644
--- a/soong/clang.go
+++ b/soong/clang.go
@@ -37,7 +37,7 @@
}
Multilib struct {
Lib32 struct {
- Suffix string
+ Suffix *string
}
}
}
@@ -45,7 +45,7 @@
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 bf5c1a4..2d00c20 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -22,6 +22,7 @@
"android/soong/genrule"
"github.com/google/blueprint"
+ "github.com/google/blueprint/proptools"
)
func init() {
@@ -43,7 +44,7 @@
)
type tblgenProperties struct {
- In string
+ In *string
Outs []string
}
@@ -59,7 +60,7 @@
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(),