commit 4c917097025fdea8112d9b5c65eeee75e05f5535
author Arjun <guzt@google.com> Tue May 07 14:19:52 2019 -0700
committer Arjun Asthana <guzt@google.com> Thu May 30 17:47:02 2019 +0000
tree 2536137d1b61aa15139ae6ecb5773cf0407644fb
parent 178da47aa9b61c78f82645b5934e2275b42c8b80

[protobuf] Allow importing std protos when compiling with full protobuf

Change-Id: I3ea72b2a4a1aee6ee8d9d2dc4676d2a9dca20fbf

proto_library.gni

diff --git a/proto_library.gni b/proto_library.gni
index 3017002..18f4927 100644
--- a/proto_library.gni
+++ b/proto_library.gni
@@ -298,6 +298,10 @@
       }
     }
 
+    if (defined(invoker.use_protobuf_full)) {
+      args += ["--import-dir=" + rebase_path("//third_party/protobuf/src", root_build_dir)]
+    }
+
     # System protoc is not used so it's necessary to build one.
     inputs = [
       protoc_path,