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("//build/config/locales.gni") | 6 import("//build/config/locales.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//chrome/chrome_repack_locales.gni") | 8 import("//chrome/chrome_repack_locales.gni") |
| 9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
| 10 | 10 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 "app/chrome_crash_reporter_client.cc", | 44 "app/chrome_crash_reporter_client.cc", |
| 45 "app/chrome_crash_reporter_client.h", | 45 "app/chrome_crash_reporter_client.h", |
| 46 "app/chrome_exe.rc", | 46 "app/chrome_exe.rc", |
| 47 "app/chrome_exe_main_win.cc", | 47 "app/chrome_exe_main_win.cc", |
| 48 "app/chrome_watcher_client_win.cc", | 48 "app/chrome_watcher_client_win.cc", |
| 49 "app/chrome_watcher_client_win.h", | 49 "app/chrome_watcher_client_win.h", |
| 50 "app/chrome_watcher_command_line_win.cc", | 50 "app/chrome_watcher_command_line_win.cc", |
| 51 "app/chrome_watcher_command_line_win.h", | 51 "app/chrome_watcher_command_line_win.h", |
| 52 "app/client_util.cc", | 52 "app/client_util.cc", |
| 53 "app/client_util.h", | 53 "app/client_util.h", |
| 54 "app/chrome_watcher_command_line_win.cc", | |
| 55 "app/chrome_watcher_command_line_win.h", | |
| 56 "app/signature_validator_win.cc", | 54 "app/signature_validator_win.cc", |
| 57 "app/signature_validator_win.h", | 55 "app/signature_validator_win.h", |
| 58 "common/crash_keys.cc", | 56 "common/crash_keys.cc", |
| 59 "common/crash_keys.h'", | 57 "common/crash_keys.h'", |
| 60 "//content/app/startup_helper_win.cc", | 58 "//content/app/startup_helper_win.cc", |
| 61 "//content/public/common/content_switches.cc", | 59 "//content/public/common/content_switches.cc", |
| 62 ] | 60 ] |
| 63 deps += [ | 61 deps += [ |
| 64 ":chrome_version_resources", | 62 ":chrome_version_resources", |
| 65 ":image_pre_reader", | 63 ":image_pre_reader", |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP) | 145 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G YP) |
| 148 | 146 |
| 149 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp | 147 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp |
| 150 # file decide what to do on a per-OS basis; on Mac, internal plugins | 148 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 151 # go inside the framework, so this dependency is in chrome_dll.gypi. | 149 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 152 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) | 150 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) |
| 153 ] | 151 ] |
| 154 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. | 152 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. |
| 155 } | 153 } |
| 156 | 154 |
| 157 if (enable_plugins) { | 155 if (is_linux && enable_plugins) { |
|
brettw
2015/02/06 23:28:07
I don't understand this change.
| |
| 158 deps += [ "//pdf" ] | 156 deps += [ "//pdf" ] |
| 159 } | 157 } |
| 160 } | 158 } |
| 161 } # !is_android | 159 } # !is_android |
| 162 | 160 |
| 163 if (!is_win || link_chrome_on_windows) { | 161 if (!is_win || link_chrome_on_windows) { |
| 164 shared_library("main_dll") { | 162 shared_library("main_dll") { |
| 165 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 163 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 166 | 164 |
| 167 deps = [ | 165 deps = [ |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 694 "//chrome/browser/ui", | 692 "//chrome/browser/ui", |
| 695 "//chrome/child", | 693 "//chrome/child", |
| 696 "//chrome/plugin", | 694 "//chrome/plugin", |
| 697 "//chrome/renderer", | 695 "//chrome/renderer", |
| 698 "//chrome/utility", | 696 "//chrome/utility", |
| 699 "//components/enhanced_bookmarks", | 697 "//components/enhanced_bookmarks", |
| 700 "//content/public/app:browser", | 698 "//content/public/app:browser", |
| 701 ] | 699 ] |
| 702 } | 700 } |
| 703 } | 701 } |
| OLD | NEW |