Merge "Remove libLLVM.so and disable some host tools"
diff --git a/soong/tblgen.go b/soong/tblgen.go
index ac7a343..825da95 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(),