Consistently use Bool instead of proptools.Bool
Use Bool instead of proptools.Bool and String instead of proptools.String.
Test: m checkbuild
Change-Id: I32d84add9f27128c7a65413e9612fd920613584f
diff --git a/java/androidmk.go b/java/androidmk.go
index c9a05c3..204b3d9 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -19,8 +19,6 @@
"io"
"strings"
- "github.com/google/blueprint/proptools"
-
"android/soong/android"
)
@@ -77,7 +75,7 @@
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
android.WriteAndroidMkData(w, data)
- if proptools.Bool(library.deviceProperties.Hostdex) && !library.Host() {
+ if Bool(library.deviceProperties.Hostdex) && !library.Host() {
fmt.Fprintln(w, "include $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_MODULE := "+name+"-hostdex")
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
@@ -117,7 +115,7 @@
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) {
- fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !proptools.Bool(prebuilt.properties.Installable))
+ fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !Bool(prebuilt.properties.Installable))
fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", prebuilt.combinedClasspathFile.String())
fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version))
},