commit 9dbf2240ec6c9dab8128cd75b6ec931a02187808
author Alain Vongsouvanh <alainv@google.com> Wed Jun 13 13:33:13 2018 -0700
committer Alain Vongsouvanh <alainv@google.com> Thu Jun 14 16:12:54 2018 +0000
tree dd3d668be76b77570cd151a5e17cd2ca42cfc802
parent 765432171d5e126153f4944cb27fe0b14ea2377f

[fidl][sdk] Add deps and public_deps to fidl sdk_atom.

DX-86

Change-Id: I728ff6052ad843c87fdb6d3d0f593e39cac460c9

fidl/fidl_library.gni

diff --git a/fidl/fidl_library.gni b/fidl/fidl_library.gni
index 2f9fbeb..17d9f8c 100644
--- a/fidl/fidl_library.gni
+++ b/fidl/fidl_library.gni
@@ -45,6 +45,17 @@
   compilation_target_name = "${target_name}_compile"
   verification_target_name = "${target_name}_verify"
 
+  all_deps = []
+  if (defined(invoker.deps) || defined(invoker.public_deps)) {
+    if (defined(invoker.deps)) {
+      all_deps += invoker.deps
+    }
+
+    if (defined(invoker.public_deps)) {
+      all_deps += invoker.public_deps
+    }
+  }
+
   action(response_file_target_name) {
     visibility = [
       ":*",
@@ -83,20 +94,10 @@
       "--sources",
     ] + rebase_path(sources, root_build_dir)
 
-    if (defined(invoker.deps) || defined(invoker.public_deps)) {
+    if (all_deps != []) {
       dep_libraries = []
 
-      merged_deps = []
-
-      if (defined(invoker.deps)) {
-        merged_deps += invoker.deps
-      }
-
-      if (defined(invoker.public_deps)) {
-        merged_deps += invoker.public_deps
-      }
-
-      foreach(dep, merged_deps) {
+      foreach(dep, all_deps) {
         gen_dir = get_label_info(dep, "target_gen_dir")
         name = get_label_info(dep, "name")
         dep_libraries += [ "$gen_dir/$name.libraries" ]
@@ -210,6 +211,12 @@
           dest = destination
         }]
       }
+
+      deps = []
+      foreach(dep, all_deps) {
+        label = get_label_info(dep, "label_no_toolchain")
+        deps += ["${label}_sdk"]
+      }
     }
   }
 }