release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440
Change-Id: I39bd5e3171d2d701524454ef35eaebc23ad95f34
diff --git a/soong/clang.go b/soong/clang.go
index f570866..85ad4f4 100644
--- a/soong/clang.go
+++ b/soong/clang.go
@@ -17,8 +17,6 @@
import (
"android/soong/android"
"android/soong/cc"
-
- "github.com/google/blueprint"
)
// Clang binaries (clang, clang-check, clang-format) need to be compiled for both 32-bit and 64-bit,
@@ -49,7 +47,7 @@
}
}
-func clangBinaryHostFactory() (blueprint.Module, []interface{}) {
+func clangBinaryHostFactory() android.Module {
module, _ := cc.NewBinary(android.HostSupported)
android.AddLoadHook(module, clangForceBuildLlvmComponents)
diff --git a/soong/tblgen.go b/soong/tblgen.go
index 4ebe70d..bf5c1a4 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -165,8 +165,10 @@
return t.generatedHeaders
}
-func clangTblgenFactory() (blueprint.Module, []interface{}) {
+func clangTblgenFactory() android.Module {
t := &tblgen{}
- return android.InitAndroidModule(t, &t.properties)
+ t.AddProperties(&t.properties)
+ android.InitAndroidModule(t)
+ return t
}
