Refactor proto in preparation for java proto support
Test: m -j checkbuild
Change-Id: Idf00ea0bacb2777458f9af2c7eb47e1e1854eeba
diff --git a/cc/gen.go b/cc/gen.go
index 6c9579e..9fc14c5 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -153,9 +153,10 @@
srcFiles[i] = cppFile
genLex(ctx, srcFile, cppFile)
case ".proto":
- cppFile, headerFile := genProto(ctx, srcFile, buildFlags.protoFlags)
- srcFiles[i] = cppFile
- deps = append(deps, headerFile)
+ protoFiles := android.GenProto(ctx, srcFile, buildFlags.protoFlags,
+ "--cpp_out", "", []string{"pb.cc", "pb.h"})
+ srcFiles[i] = protoFiles[0]
+ deps = append(deps, protoFiles[1])
case ".aidl":
cppFile := android.GenPathWithExt(ctx, "aidl", srcFile, "cpp")
srcFiles[i] = cppFile