Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//remoting/remoting_enable.gni") | 6 import("//remoting/remoting_enable.gni") |
| 7 import("//remoting/remoting_locales.gni") | 7 import("//remoting/remoting_locales.gni") |
| 8 import("//remoting/remoting_version.gni") | 8 import("//remoting/remoting_version.gni") |
| 9 | 9 |
| 10 if (is_win) { | 10 if (is_win) { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 "//net", | 45 "//net", |
| 46 "//remoting/base", | 46 "//remoting/base", |
| 47 "//remoting/host", | 47 "//remoting/host", |
| 48 "//remoting/protocol", | 48 "//remoting/protocol", |
| 49 "//remoting/resources", | 49 "//remoting/resources", |
| 50 ] | 50 ] |
| 51 } | 51 } |
| 52 | 52 |
| 53 if (!is_chromeos && !is_android && enable_remoting_host) { | 53 if (!is_chromeos && !is_android && enable_remoting_host) { |
| 54 if (is_win) { | 54 if (is_win) { |
| 55 # GYP version: | 55 # GYP version: |
|
joedow
2016/09/12 18:58:43
nit: Remove the GYP comments while you are in here
nicholss
2016/09/12 19:56:32
I will do it in another CL. A simple search and re
joedow
2016/09/12 21:51:52
OK, I filed a tracking and assigned to you.
| |
| 56 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host | 56 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host |
| 57 executable("remote_assistance_host") { | 57 executable("remote_assistance_host") { |
| 58 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 58 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 59 | 59 |
| 60 deps = [ | 60 deps = [ |
| 61 "//base/allocator", | 61 "//base/allocator", |
| 62 "//remoting/host:dpi_aware_exe_manifest", | 62 "//remoting/host/win:dpi_aware_exe_manifest", |
| 63 "//remoting/host:remoting_core", | 63 "//remoting/host/win:remoting_core", |
| 64 "//remoting/host:remoting_windows_resources", | 64 "//remoting/host/win:remoting_windows_resources", |
| 65 ] | 65 ] |
| 66 | 66 |
| 67 sources = [ | 67 sources = [ |
| 68 "$root_gen_dir/remoting/version.rc", | 68 "$root_gen_dir/remoting/version.rc", |
| 69 "it2me_native_messaging_host_entry_point.cc", | 69 "it2me_native_messaging_host_entry_point.cc", |
| 70 ] | 70 ] |
| 71 | 71 |
| 72 defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ] | 72 defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ] |
| 73 | 73 |
| 74 ldflags = [ | 74 ldflags = [ |
| 75 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in | 75 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in |
| 76 # GYP does not take effect? | 76 # GYP does not take effect? |
| 77 "comctl32.lib", | 77 "comctl32.lib", |
| 78 ] | 78 ] |
| 79 } | 79 } |
| 80 | 80 |
| 81 # GYP version: | 81 # GYP version: |
| 82 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host_uia ccess | 82 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host_uia ccess |
| 83 executable("remote_assistance_host_uiaccess") { | 83 executable("remote_assistance_host_uiaccess") { |
| 84 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 84 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 85 | 85 |
| 86 deps = [ | 86 deps = [ |
| 87 "//base/allocator", | 87 "//base/allocator", |
| 88 "//remoting/host:remoting_core", | 88 "//remoting/host/win:remoting_core", |
| 89 "//remoting/host:remoting_windows_resources", | 89 "//remoting/host/win:remoting_windows_resources", |
| 90 ] | 90 ] |
| 91 | 91 |
| 92 sources = [ | 92 sources = [ |
| 93 "$root_gen_dir/remoting/version.rc", | 93 "$root_gen_dir/remoting/version.rc", |
| 94 "it2me_native_messaging_host_entry_point.cc", | 94 "it2me_native_messaging_host_entry_point.cc", |
| 95 ] | 95 ] |
| 96 | 96 |
| 97 defines = host_predefines + [ "BINARY=BINARY_HOST_IT2ME_UIACCESS" ] | 97 defines = host_predefines + [ "BINARY=BINARY_HOST_IT2ME_UIACCESS" ] |
| 98 | 98 |
| 99 ldflags = [ | 99 ldflags = [ |
| 100 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in | 100 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in |
| 101 # GYP does not take effect? | 101 # GYP does not take effect? |
| 102 "comctl32.lib", | 102 "comctl32.lib", |
| 103 ] | 103 ] |
| 104 | 104 |
| 105 # uiAccess requires a signed build to work correctly, so only enable the | 105 # uiAccess requires a signed build to work correctly, so only enable the |
| 106 # manifest flag when the binary will be properly signed. | 106 # manifest flag when the binary will be properly signed. |
| 107 if (is_official_build) { | 107 if (is_official_build) { |
| 108 deps += [ "//remoting/host:dpi_aware_uiaccess_exe_manifest" ] | 108 deps += [ "//remoting/host:dpi_aware_uiaccess_exe_manifest" ] |
| 109 } else { | 109 } else { |
| 110 deps += [ "//remoting/host:dpi_aware_exe_manifest" ] | 110 deps += [ "//remoting/host/win:dpi_aware_exe_manifest" ] |
| 111 } | 111 } |
| 112 } | 112 } |
| 113 } else { | 113 } else { |
| 114 if (is_mac) { | 114 if (is_mac) { |
| 115 app_target_type = "mac_app_bundle" | 115 app_target_type = "mac_app_bundle" |
| 116 | 116 |
| 117 # remote_assistance_host-InfoPlist.strings | 117 # remote_assistance_host-InfoPlist.strings |
| 118 foreach(locale, remoting_locales_with_underscores) { | 118 foreach(locale, remoting_locales_with_underscores) { |
| 119 bundle_data("remote_assistance_host_strings_${locale}_bundle_data") { | 119 bundle_data("remote_assistance_host_strings_${locale}_bundle_data") { |
| 120 sources = [ | 120 sources = [ |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 if (enable_webrtc) { | 208 if (enable_webrtc) { |
| 209 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 209 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
| 210 } | 210 } |
| 211 | 211 |
| 212 if (is_desktop_linux) { | 212 if (is_desktop_linux) { |
| 213 deps += [ "//build/config/linux/gtk2" ] | 213 deps += [ "//build/config/linux/gtk2" ] |
| 214 } | 214 } |
| 215 } | 215 } |
| 216 } | 216 } |
| 217 } | 217 } |
| OLD | NEW |