commit 9a1e70c038b7e976d09eec711d4bff088c75e029
author Gary Miguel <garymm@google.com> Thu Oct 22 12:50:42 2020 -0700
committer Gary Miguel <garymm@google.com> Thu Oct 22 22:14:55 2020 +0000
tree ecff4e7700017b6a86b67f2315c0f47203e85d33
parent 4006edda1b763934d683e236103d734aab065418

[proto_library] move action to public_deps

This allows other rules to depend on the outputs of the action.
An example of why this is useful:
https://fuchsia-review.googlesource.com/c/fuchsia/+/442058

Bug: 61402
Change-Id: I6e0e4141fb96b31b90a072425ca9cb8823303247
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/protobuf/+/441768
Reviewed-by: Zach Bush <zmbush@google.com>

proto_library.gni

diff --git a/proto_library.gni b/proto_library.gni
index 1ddf7dd..29ef1b3 100644
--- a/proto_library.gni
+++ b/proto_library.gni
@@ -344,6 +344,7 @@
     forward_variables_from(invoker,
                            [
                              "defines",
+                             "deps",
                              "testonly",
                              "visibility",
                            ])
@@ -361,6 +362,7 @@
 
     configs += [ "//third_party/protobuf:protobuf_warnings" ]
     public_configs = [ "//third_party/protobuf:using_proto" ]
+    public_deps = [ ":${action_name}" ]
 
     if (generate_cc || generate_with_plugin) {
       # If using built-in cc generator, the resulting headers reference headers
@@ -369,19 +371,11 @@
       if (generate_cc) {
         if (defined(invoker.use_protobuf_full) &&
             invoker.use_protobuf_full == true) {
-          public_deps = [ "//third_party/protobuf:protobuf_full" ]
+          public_deps += [ "//third_party/protobuf:protobuf_full" ]
         } else {
-          public_deps = [ "//third_party/protobuf:protobuf_lite" ]
+          public_deps += [ "//third_party/protobuf:protobuf_lite" ]
         }
       }
     }
-
-    deps = [ ":$action_name" ]
-
-    # This will link any libraries in the deps (the use of invoker.deps in the
-    # action won't link it).
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
   }
 }