Refactor proto in preparation for java proto support
Test: m -j checkbuild
Change-Id: Idf00ea0bacb2777458f9af2c7eb47e1e1854eeba
diff --git a/cc/compiler.go b/cc/compiler.go
index 5ffaf17..a65ddf8 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -141,6 +141,11 @@
}
}
+ Proto struct {
+ // Link statically against the protobuf runtime
+ Static bool `android:"arch_variant"`
+ } `android:"arch_variant"`
+
// Stores the original list of source files before being cleared by library reuse
OriginalSrcs []string `blueprint:"mutated"`
}
@@ -151,7 +156,7 @@
type baseCompiler struct {
Properties BaseCompilerProperties
- Proto ProtoProperties
+ Proto android.ProtoProperties
deps android.Paths
srcs android.Paths
flags builderFlags
@@ -188,7 +193,7 @@
android.ExtractSourcesDeps(ctx, compiler.Properties.Srcs)
if compiler.hasSrcExt(".proto") {
- deps = protoDeps(ctx, deps, &compiler.Proto)
+ deps = protoDeps(ctx, deps, &compiler.Proto, compiler.Properties.Proto.Static)
}
return deps