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/proto.go b/java/proto.go
index 2991ad9..cfd733a 100644
--- a/java/proto.go
+++ b/java/proto.go
@@ -18,7 +18,6 @@
"strings"
"github.com/google/blueprint"
- "github.com/google/blueprint/proptools"
"android/soong/android"
)
@@ -67,7 +66,7 @@
}
func protoDeps(ctx android.BottomUpMutatorContext, p *android.ProtoProperties) {
- switch proptools.String(p.Proto.Type) {
+ switch String(p.Proto.Type) {
case "micro":
ctx.AddDependency(ctx.Module(), staticLibTag, "libprotobuf-java-micro")
case "nano":
@@ -82,14 +81,14 @@
}
default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q",
- proptools.String(p.Proto.Type))
+ String(p.Proto.Type))
}
}
func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties,
flags javaBuilderFlags) javaBuilderFlags {
- switch proptools.String(p.Proto.Type) {
+ switch String(p.Proto.Type) {
case "micro":
flags.protoOutTypeFlag = "--javamicro_out"
case "nano":
@@ -101,7 +100,7 @@
flags.protoOutTypeFlag = "--java_out"
default:
ctx.PropertyErrorf("proto.type", "unknown proto type %q",
- proptools.String(p.Proto.Type))
+ String(p.Proto.Type))
}
if len(j.Proto.Output_params) > 0 {