| 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/allocator.gni") | |
| 6 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 8 import("//build/util/version.gni") | 7 import("//build/util/version.gni") |
| 9 import("//remoting/remoting_host.gni") | 8 import("//remoting/remoting_host.gni") |
| 10 import("//remoting/remoting_locales.gni") | 9 import("//remoting/remoting_locales.gni") |
| 11 import("//remoting/remoting_options.gni") | 10 import("//remoting/remoting_options.gni") |
| 12 import("//remoting/remoting_srcs.gni") | 11 import("//remoting/remoting_srcs.gni") |
| 13 import("//remoting/remoting_version.gni") | 12 import("//remoting/remoting_version.gni") |
| 14 import("//remoting/tools/build/remoting_localize.gni") | 13 import("//remoting/tools/build/remoting_localize.gni") |
| 15 | 14 |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 | 537 |
| 539 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 538 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 540 | 539 |
| 541 # The |major|, |build| and |patch| versions are inherited from Chrome. | 540 # The |major|, |build| and |patch| versions are inherited from Chrome. |
| 542 # Since Chrome's |minor| version is always '0', we replace it with a | 541 # Since Chrome's |minor| version is always '0', we replace it with a |
| 543 # Chromoting-specific patch version. | 542 # Chromoting-specific patch version. |
| 544 defines = [ "VERSION=" + "$chrome_version_major" + "." + | 543 defines = [ "VERSION=" + "$chrome_version_major" + "." + |
| 545 "$remoting_version_patch" + "." + "$chrome_version_build" + | 544 "$remoting_version_patch" + "." + "$chrome_version_build" + |
| 546 "." + "$chrome_version_patch" ] | 545 "." + "$chrome_version_patch" ] |
| 547 | 546 |
| 548 if (is_linux && use_allocator != "none") { | 547 if (is_mac || is_win) { |
| 549 deps += [ "//base/allocator" ] | |
| 550 } else if (is_mac || is_win) { | |
| 551 assert(false, "not implemented on mac or win yet") | 548 assert(false, "not implemented on mac or win yet") |
| 552 } | 549 } |
| 553 } | 550 } |
| 554 } | 551 } |
| 555 | 552 |
| 556 if (is_chrome_branded && enable_me2me_host && !is_chromeos) { | 553 if (is_chrome_branded && enable_me2me_host && !is_chromeos) { |
| 557 # TODO(GYP): add support for archive_chromoting_tests variable? | 554 # TODO(GYP): add support for archive_chromoting_tests variable? |
| 558 | 555 |
| 559 import("//build/config/zip.gni") | 556 import("//build/config/zip.gni") |
| 560 | 557 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 "//remoting/resources", | 639 "//remoting/resources", |
| 643 "//third_party/icu:icudata", | 640 "//third_party/icu:icudata", |
| 644 ] | 641 ] |
| 645 } | 642 } |
| 646 } else { | 643 } else { |
| 647 group("remoting_me2me_host_archive") { | 644 group("remoting_me2me_host_archive") { |
| 648 } | 645 } |
| 649 } | 646 } |
| 650 } | 647 } |
| 651 } | 648 } |
| OLD | NEW |