commit 38f794ee496764f1b429c1786cf84758ba6f00a8
author Colin Cross <ccross@android.com> Thu Sep 07 10:53:07 2017 -0700
committer Colin Cross <ccross@android.com> Mon Sep 11 12:41:58 2017 -0700
tree 74c774238209c16d7325e882d7cbd9123df76a3b
parent ffe58feb76fbb1ba1a9aa36d79bc90164ebef009

Refactor proto in preparation for java proto support

Test: m -j checkbuild
Change-Id: Idf00ea0bacb2777458f9af2c7eb47e1e1854eeba

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 1537fd4..577521c 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -655,8 +655,8 @@
 	if library.Properties.Proto.Export_proto_headers {
 		if library.baseCompiler.hasSrcExt(".proto") {
 			flags := []string{
-				"-I" + protoSubDir(ctx).String(),
-				"-I" + protoDir(ctx).String(),
+				"-I" + android.ProtoSubDir(ctx).String(),
+				"-I" + android.ProtoDir(ctx).String(),
 			}
 			library.reexportFlags(flags)
 			library.reuseExportedFlags = append(library.reuseExportedFlags, flags...)