[googleapis] use import_protobuf_full param
This hides the directory layout of the protobuf sources, which is a
nicer abstraction for users of the protobuf templates.
Bug: 59636
Change-Id: I5845df90d2385d79613b0e707b425c6a6176b9b8
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/googleapis/+/487897
Reviewed-by: Zach Bush <zmbush@google.com>
diff --git a/google/api/BUILD.gn b/google/api/BUILD.gn
index 22e9fca..9213e57 100644
--- a/google/api/BUILD.gn
+++ b/google/api/BUILD.gn
@@ -10,11 +10,9 @@
"http.proto",
]
proto_in_dir = "//third_party/googleapis"
- import_dirs = [
- "//third_party/googleapis",
- "//third_party/protobuf/src",
- ]
+ import_dirs = [ "//third_party/googleapis" ]
generate_python = false
cc_generator_options = "lite"
+ import_protobuf_full = true
extra_configs = [ "//third_party/googleapis:googleapis_config" ]
}
diff --git a/google/firestore/v1beta1/BUILD.gn b/google/firestore/v1beta1/BUILD.gn
index 24ec5d2..641607e 100644
--- a/google/firestore/v1beta1/BUILD.gn
+++ b/google/firestore/v1beta1/BUILD.gn
@@ -28,18 +28,14 @@
}
proto_library("service") {
- sources = [
- "firestore.proto",
- ]
+ sources = [ "firestore.proto" ]
proto_in_dir = "//third_party/googleapis"
- import_dirs = [
- "//third_party/googleapis",
- "//third_party/protobuf/src",
- ]
+ import_dirs = [ "//third_party/googleapis" ]
generate_python = false
generator_plugin_label = "//third_party/grpc:grpc_cpp_plugin"
generator_plugin_suffix = ".grpc.pb"
cc_generator_options = "lite"
+ import_protobuf_full = true
deps = [
":v1beta1",
diff --git a/google/rpc/BUILD.gn b/google/rpc/BUILD.gn
index 32d0e9d..340b0bb 100644
--- a/google/rpc/BUILD.gn
+++ b/google/rpc/BUILD.gn
@@ -5,15 +5,11 @@
import("//third_party/protobuf/proto_library.gni")
proto_library("status") {
- sources = [
- "status.proto",
- ]
+ sources = [ "status.proto" ]
proto_in_dir = "//third_party/googleapis"
- import_dirs = [
- "//third_party/googleapis",
- "//third_party/protobuf/src",
- ]
+ import_dirs = [ "//third_party/googleapis" ]
generate_python = false
cc_generator_options = "lite"
+ import_protobuf_full = true
extra_configs = [ "//third_party/googleapis:googleapis_config" ]
}
diff --git a/google/type/BUILD.gn b/google/type/BUILD.gn
index 50c5632..b569d2a 100644
--- a/google/type/BUILD.gn
+++ b/google/type/BUILD.gn
@@ -5,15 +5,11 @@
import("//third_party/protobuf/proto_library.gni")
proto_library("latlng") {
- sources = [
- "latlng.proto",
- ]
+ sources = [ "latlng.proto" ]
proto_in_dir = "//third_party/googleapis"
- import_dirs = [
- "//third_party/googleapis",
- "//third_party/protobuf/src",
- ]
+ import_dirs = [ "//third_party/googleapis" ]
generate_python = false
cc_generator_options = "lite"
+ import_protobuf_full = true
extra_configs = [ "//third_party/googleapis:googleapis_config" ]
}