[Mac/GN] Add missing files to some //remoting targets.

BUG=611859 R=sergeyu@chromium.org Review-Url: https://codereview.chromium.org/2153883002 Cr-Commit-Position: refs/heads/master@{#405855}
Denger-Network · Jul 15, 2016 · d281f45 · d281f45
1 parent d3fb3a3
commit d281f45
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 7 deletions.
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
@@ -964,6 +964,29 @@ if (enable_me2me_host) {
           ]
         }
       }
+
+      mac_xib_bundle_data("remoting_host_xibs") {
+        sources = [
+          "disconnect_window.xib",
+        ]
+      }
+
+      bundle_data("remoting_host_resources") {
+        sources = [
+          "$root_gen_dir/remoting/CREDITS.txt",
+          "$root_out_dir/icudtl.dat",
+          "remoting_me2me_host.icns",
+        ]
+
+        outputs = [
+          "{{bundle_resources_dir}}/{{source_file_part}}",
+        ]
+
+        public_deps = [
+          ":credits",
+          "//third_party/icu:icudata",
+        ]
+      }
     }
 
     target(app_target_type, "remoting_me2me_host") {
@@ -998,6 +1021,8 @@ if (enable_me2me_host) {
           ]
         }
         deps += [
+          ":remoting_host_resources",
+          ":remoting_host_xibs",
           ":remoting_infoplist_strings",
           "//remoting/resources:copy_locales",
         ]
@@ -1411,6 +1436,7 @@ if (enable_me2me_host) {
       ]
 
       deps = [
+        ":remoting_host_uninstaller_resources",
         ":remoting_host_uninstaller_xibs",
         ":remoting_infoplist_strings",
         "//base",
@@ -1422,9 +1448,17 @@ if (enable_me2me_host) {
 
     mac_xib_bundle_data("remoting_host_uninstaller_xibs") {
       sources = [
-        #"installer/mac/uninstaller/remoting_uninstaller.icns",
         "installer/mac/uninstaller/remoting_uninstaller.xib",
-        #_uninstaller_plist
+      ]
+    }
+
+    bundle_data("remoting_host_uninstaller_resources") {
+      sources = [
+        "installer/mac/uninstaller/remoting_uninstaller.icns",
+      ]
+
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
       ]
     }
 
@@ -1437,6 +1471,7 @@ if (enable_me2me_host) {
         ":remoting_host_prefpane",
         ":remoting_host_prefpane_bundle_data",
         ":remoting_host_prefpane_plist",
+        ":remoting_host_prefpane_resources",
         ":remoting_host_prefpane_xibs",
         ":remoting_infoplist_strings",
       ]
@@ -1454,7 +1489,17 @@ if (enable_me2me_host) {
         "$root_build_dir/gen/remoting/host/remoting_host_prefpane",
       ]
       outputs = [
-        "{{bundle_executable_dir}}/remoting_host_prefname",
+        "{{bundle_executable_dir}}/{{source_file_part}}",
+      ]
+    }
+
+    bundle_data("remoting_host_prefpane_resources") {
+      sources = [
+        "//remoting/resources/chromoting128.png",
+      ]
+
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
       ]
     }
 
@@ -1480,7 +1525,6 @@ if (enable_me2me_host) {
 
       deps = [
         ":host",
-        ":remoting_host_prefpane_xibs",
         ":remoting_infoplist_strings",
         "//remoting/base",
         "//remoting/resources:copy_locales",
@@ -1517,10 +1561,10 @@ if (enable_me2me_host) {
     mac_xib_bundle_data("remoting_host_prefpane_xibs") {
       sources = [
         "mac/me2me_preference_pane.xib",
-        #"mac/me2me_preference_pane_confirm_pin.xib",
-        #"mac/me2me_preference_pane_disable.xib",
+        "mac/me2me_preference_pane_confirm_pin.xib",
+        "mac/me2me_preference_pane_disable.xib",
+
         #"mac/me2me_preference_pane-Info.plist",
-        #"//remoting/resources/chromoting128.png",
       ]
     }
   } else {

diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
@@ -92,6 +92,26 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
           ]
         }
       }
+
+      mac_xib_bundle_data("remote_assistance_host_xibs") {
+        sources = [
+          "//remoting/host/disconnect_window.xib",
+        ]
+      }
+
+      bundle_data("remote_assistance_host_resources") {
+        sources = [
+          "$root_out_dir/icudtl.dat",
+        ]
+
+        outputs = [
+          "{{bundle_resources_dir}}/{{source_file_part}}",
+        ]
+
+        public_deps = [
+          "//third_party/icu:icudata",
+        ]
+      }
     } else {
       app_target_type = "executable"
     }
@@ -132,6 +152,8 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
           ]
         }
         deps += [
+          ":remote_assistance_host_resources",
+          ":remote_assistance_host_xibs",
           "//remoting/host:remoting_infoplist_strings",
           "//remoting/resources:copy_locales",
         ]