| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/locales.gni") | 7 import("//build/config/locales.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//chrome/chrome_repack_locales.gni") | 9 import("//chrome/chrome_repack_locales.gni") |
| 10 import("//chrome/version.gni") | 10 import("//chrome/version.gni") |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 "//base/allocator", | 109 "//base/allocator", |
| 110 | 110 |
| 111 # Needed to use the master_preferences functions | 111 # Needed to use the master_preferences functions |
| 112 "//chrome/installer/util", | 112 "//chrome/installer/util", |
| 113 "//content/public/app:both", | 113 "//content/public/app:both", |
| 114 ] | 114 ] |
| 115 | 115 |
| 116 # Needed for chrome_main.cc initialization of libraries. | 116 # Needed for chrome_main.cc initialization of libraries. |
| 117 configs += [ "//build/config/linux:pangocairo" ] | 117 configs += [ "//build/config/linux:pangocairo" ] |
| 118 | 118 |
| 119 # TODO(GYP) ['profiling==0 and linux_disable_pie==0', { | 119 # GYP has this in a 'profiling==0 and linux_disable_pie==0' condition. |
| 120 # 'ldflags': [ | 120 # but GN doesn't have either of these flags. |
| 121 # '-pie', | 121 ldflags = [ "-pie" ] |
| 122 # ], | |
| 123 #}], | |
| 124 | 122 |
| 125 if (use_x11) { | 123 if (use_x11) { |
| 126 configs += [ | 124 configs += [ |
| 127 "//build/config/linux:x11", | 125 "//build/config/linux:x11", |
| 128 "//build/config/linux:xext", | 126 "//build/config/linux:xext", |
| 129 ] | 127 ] |
| 130 } | 128 } |
| 131 } | 129 } |
| 132 | 130 |
| 133 if (is_mac) { | 131 if (is_mac) { |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 | 778 |
| 781 args = [ | 779 args = [ |
| 782 rebase_path(infile, root_build_dir), | 780 rebase_path(infile, root_build_dir), |
| 783 rebase_path(outfile, root_build_dir), | 781 rebase_path(outfile, root_build_dir), |
| 784 "-e s/@@NAME@@/$name/", | 782 "-e s/@@NAME@@/$name/", |
| 785 "-e s/@@FILENAME@@/$filename/", | 783 "-e s/@@FILENAME@@/$filename/", |
| 786 "-e s/@@CONFDIR@@/$confdir/", | 784 "-e s/@@CONFDIR@@/$confdir/", |
| 787 ] | 785 ] |
| 788 } | 786 } |
| 789 } | 787 } |
| OLD | NEW |