| 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("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//build/config/win/manifest.gni") | 7 import("//build/config/win/manifest.gni") |
| 8 import("//build/util/version.gni") | 8 import("//build/util/version.gni") |
| 9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
| 10 import("//remoting/remoting_enable.gni") | 10 import("//remoting/remoting_enable.gni") |
| (...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 ] | 1635 ] |
| 1636 } | 1636 } |
| 1637 } else { | 1637 } else { |
| 1638 group("remoting_me2me_host_archive") { | 1638 group("remoting_me2me_host_archive") { |
| 1639 } | 1639 } |
| 1640 } | 1640 } |
| 1641 | 1641 |
| 1642 if (is_win && is_chrome_branded) { | 1642 if (is_win && is_chrome_branded) { |
| 1643 # We do not release a 64 bits binary. So to avoid any potential | 1643 # We do not release a 64 bits binary. So to avoid any potential |
| 1644 # misunderstanding, we only build 32 bits MSI file. | 1644 # misunderstanding, we only build 32 bits MSI file. |
| 1645 if (target_cpu == "x86") { | 1645 if (!is_component_build && target_cpu == "x86") { |
| 1646 # The script uses "ia32" instead of "x86". | 1646 # The script uses "ia32" instead of "x86". |
| 1647 msi_script_arch = "ia32" | 1647 msi_script_arch = "ia32" |
| 1648 | 1648 |
| 1649 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation | 1649 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation |
| 1650 action("remoting_host_installation") { | 1650 action("remoting_host_installation") { |
| 1651 deps = [ | 1651 deps = [ |
| 1652 "//remoting/host:remoting_me2me_host_archive", | 1652 "//remoting/host:remoting_me2me_host_archive", |
| 1653 ] | 1653 ] |
| 1654 script = "../tools/zip2msi.py" | 1654 script = "../tools/zip2msi.py" |
| 1655 outputs = [ | 1655 outputs = [ |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1666 root_build_dir), | 1666 root_build_dir), |
| 1667 rebase_path(outputs[0], root_build_dir), | 1667 rebase_path(outputs[0], root_build_dir), |
| 1668 ] | 1668 ] |
| 1669 } | 1669 } |
| 1670 } else { | 1670 } else { |
| 1671 group("remoting_host_installation") { | 1671 group("remoting_host_installation") { |
| 1672 } | 1672 } |
| 1673 } | 1673 } |
| 1674 } | 1674 } |
| 1675 } | 1675 } |
| OLD | NEW |