commit 05d8ef2155f057686e8e223a09c45ac01266c9fa
author Alexei Frolov <frolv@google.com> Mon Jun 08 10:32:29 2020 -0700
committer Alexei Frolov <frolv@google.com> Mon Jun 08 10:32:29 2020 -0700
tree bbf5e0a602644ce944ee2153096a3227391e7df5
parent 4032a77c2bb6d60944a28d842e8ee01b08ca9d41

pw_proto_compiler: Support inputs argument

This change adds an inputs argument to pw_proto_library for additional
files on which protos depend (e.g. nanopb options files).

Change-Id: Iafb32fb8e7d9c47b716b5da1544d3d8158e2a77e

pw_protobuf_compiler/proto.gni

diff --git a/pw_protobuf_compiler/proto.gni b/pw_protobuf_compiler/proto.gni
index 8d33a8b..58306dc 100644
--- a/pw_protobuf_compiler/proto.gni
+++ b/pw_protobuf_compiler/proto.gni
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+import("$dir_pw_build/input_group.gni")
 import("$dir_pw_build/python_script.gni")
 
 # Python script that invokes protoc.
@@ -219,6 +220,7 @@
 # Args:
 #  sources: List of input .proto files.
 #  deps: List of other pw_proto_library dependencies.
+#  inputs: Other files on which the protos depend (e.g. nanopb .options files).
 template("pw_proto_library") {
   assert(defined(invoker.sources) && invoker.sources != [],
          "pw_proto_library requires .proto source files")
@@ -243,6 +245,17 @@
     }
   }
 
+  _deps = [ ":$_include_metadata_target" ]
+
+  if (defined(invoker.inputs)) {
+    # Toss any additional inputs into an input group dependency.
+    _input_target_name = "${target_name}_inputs"
+    pw_input_group(_input_target_name) {
+      inputs = invoker.inputs
+    }
+    _deps += [ ":$_input_target_name" ]
+  }
+
   foreach(_gen, pw_protobuf_generators) {
     _lang_target = "${target_name}_${_gen}"
 
@@ -255,7 +268,7 @@
       _pw_pwpb_proto_library(_lang_target) {
         forward_variables_from(invoker, _forwarded_vars)
         protos = invoker.sources
-        deps = [ ":$_include_metadata_target" ]
+        deps = _deps
         include_file = _include_metadata_file
         gen_deps = _gen_deps
 
@@ -267,7 +280,7 @@
       _pw_nanopb_proto_library(_lang_target) {
         forward_variables_from(invoker, _forwarded_vars)
         protos = invoker.sources
-        deps = [ ":$_include_metadata_target" ]
+        deps = _deps
         include_file = _include_metadata_file
         gen_deps = _gen_deps
       }
@@ -275,7 +288,7 @@
       _pw_go_proto_library(_lang_target) {
         forward_variables_from(invoker, _forwarded_vars)
         protos = invoker.sources
-        deps = [ ":$_include_metadata_target" ]
+        deps = _deps
         include_file = _include_metadata_file
         gen_deps = _gen_deps
       }

pw_watch/py/pw_watch/watch.py

diff --git a/pw_watch/py/pw_watch/watch.py b/pw_watch/py/pw_watch/watch.py
index c1c3d90..e1f8485 100755
--- a/pw_watch/py/pw_watch/watch.py
+++ b/pw_watch/py/pw_watch/watch.py
@@ -311,6 +311,7 @@
     '*.hpp',
     '*.ld',
     '*.md',
+    '*.options',
     '*.proto',
     '*.py',
     '*.rst',