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_srcs.gni") | 7 import("//remoting/remoting_srcs.gni") |
| 8 import("//remoting/remoting_locales.gni") | 8 import("//remoting/remoting_locales.gni") |
| 9 import("//remoting/remoting_version.gni") | 9 import("//remoting/remoting_version.gni") |
| 10 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 | 46 |
| 47 if (!is_chromeos && !is_android && enable_remoting_host) { | 47 if (!is_chromeos && !is_android && enable_remoting_host) { |
| 48 if (is_win) { | 48 if (is_win) { |
| 49 # GYP version: | 49 # GYP version: |
| 50 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host | 50 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host |
| 51 executable("remote_assistance_host") { | 51 executable("remote_assistance_host") { |
| 52 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 52 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 53 | 53 |
| 54 deps = [ | 54 deps = [ |
| 55 "//base/allocator", | 55 "//base/allocator", |
| 56 "//remoting/host:dpi_aware_exe_manifest", | |
| 56 "//remoting/host:remoting_core", | 57 "//remoting/host:remoting_core", |
| 57 "//remoting/host:remoting_windows_resources", | 58 "//remoting/host:remoting_windows_resources", |
| 58 ] | 59 ] |
| 59 | 60 |
| 60 sources = [ | 61 sources = [ |
| 61 "$root_gen_dir/remoting/version.rc", | 62 "$root_gen_dir/remoting/version.rc", |
| 62 "it2me_native_messaging_host_entry_point.cc", | 63 "it2me_native_messaging_host_entry_point.cc", |
| 63 ] | 64 ] |
| 64 | 65 |
| 65 defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ] | 66 defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ] |
| 66 | 67 |
| 67 ldflags = [ | 68 ldflags = [ |
| 68 "/MANIFEST:EMBED", | |
| 69 "/MANIFESTINPUT:" + | |
| 70 rebase_path("../win/common-controls.manifest", root_build_dir), | |
| 71 "/MANIFESTINPUT:" + | |
| 72 rebase_path("../win/dpi_aware.manifest", root_build_dir), | |
| 73 | |
| 74 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in | 69 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in |
| 75 # GYP does not take effect? | 70 # GYP does not take effect? |
| 76 "comctl32.lib", | 71 "comctl32.lib", |
| 77 ] | 72 ] |
| 78 } | 73 } |
| 74 | |
| 75 # GYP version: | |
| 76 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host_uia ccess | |
| 77 executable("remote_assistance_host_uiaccess") { | |
| 78 configs += [ "//build/config/compiler:wexit_time_destructors" ] | |
| 79 | |
| 80 deps = [ | |
| 81 "//base/allocator", | |
| 82 "//remoting/host:remoting_core", | |
| 83 "//remoting/host:remoting_windows_resources", | |
| 84 ] | |
| 85 | |
| 86 sources = [ | |
| 87 "$root_gen_dir/remoting/version.rc", | |
| 88 "it2me_native_messaging_host_entry_point.cc", | |
| 89 ] | |
| 90 | |
| 91 defines = host_predefines + [ "BINARY=BINARY_HOST_IT2ME_UIACCESS" ] | |
| 92 | |
| 93 ldflags = [ | |
| 94 # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in | |
| 95 # GYP does not take effect? | |
| 96 "comctl32.lib", | |
| 97 ] | |
| 98 | |
| 99 # uiAccess requires a signed build to work correctly, so only enable the | |
| 100 # manifest flag when the binary will be properly signed. | |
| 101 if (is_official_build) { | |
|
Jamie
2016/08/26 00:29:47
Would it be better to only build this target for a
joedow
2016/08/26 18:28:52
My thought on this was that it is better to build
| |
| 102 deps += [ "//remoting/host:dpi_aware_uiaccess_exe_manifest" ] | |
| 103 } else { | |
| 104 deps += [ "//remoting/host:dpi_aware_exe_manifest" ] | |
| 105 } | |
| 106 } | |
| 79 } else { | 107 } else { |
| 80 if (is_mac) { | 108 if (is_mac) { |
| 81 app_target_type = "mac_app_bundle" | 109 app_target_type = "mac_app_bundle" |
| 82 | 110 |
| 83 # remote_assistance_host-InfoPlist.strings | 111 # remote_assistance_host-InfoPlist.strings |
| 84 foreach(locale, remoting_locales_with_underscores) { | 112 foreach(locale, remoting_locales_with_underscores) { |
| 85 bundle_data("remote_assistance_host_strings_${locale}_bundle_data") { | 113 bundle_data("remote_assistance_host_strings_${locale}_bundle_data") { |
| 86 sources = [ | 114 sources = [ |
| 87 "$root_gen_dir/remoting/host/remote_assistance_host-InfoPlist.string s/$locale.lproj/InfoPlist.strings", | 115 "$root_gen_dir/remoting/host/remote_assistance_host-InfoPlist.string s/$locale.lproj/InfoPlist.strings", |
| 88 ] | 116 ] |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 if (enable_webrtc) { | 202 if (enable_webrtc) { |
| 175 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 203 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
| 176 } | 204 } |
| 177 | 205 |
| 178 if (is_desktop_linux) { | 206 if (is_desktop_linux) { |
| 179 deps += [ "//build/config/linux/gtk2" ] | 207 deps += [ "//build/config/linux/gtk2" ] |
| 180 } | 208 } |
| 181 } | 209 } |
| 182 } | 210 } |
| 183 } | 211 } |
| OLD | NEW |