| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G
YP) | 143 #'../third_party/adobe/flash/flash_player.gyp:flapper_binaries', TODO(G
YP) |
| 144 | 144 |
| 145 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp | 145 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp |
| 146 # file decide what to do on a per-OS basis; on Mac, internal plugins | 146 # file decide what to do on a per-OS basis; on Mac, internal plugins |
| 147 # go inside the framework, so this dependency is in chrome_dll.gypi. | 147 # go inside the framework, so this dependency is in chrome_dll.gypi. |
| 148 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD
O(GYP) | 148 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD
O(GYP) |
| 149 ] | 149 ] |
| 150 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. | 150 # TODO(GYP) some stuff from GYP including chrome_multiple_dll. |
| 151 } | 151 } |
| 152 | 152 |
| 153 if (!is_mac) { | 153 if (enable_plugins) { |
| 154 # On Mac this is done in chrome_dll.gypi. | 154 deps += [ "//pdf" ] |
| 155 datadeps += [ "//pdf" ] | |
| 156 # TODO(GYP) pdf linux symbols | |
| 157 } | 155 } |
| 158 } | 156 } |
| 159 } # !is_android | 157 } # !is_android |
| 160 | 158 |
| 161 if (!is_win || link_chrome_on_windows) { | 159 if (!is_win || link_chrome_on_windows) { |
| 162 shared_library("main_dll") { | 160 shared_library("main_dll") { |
| 163 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 161 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 164 | 162 |
| 165 deps = [ | 163 deps = [ |
| 166 ":browser_dependencies", | 164 ":browser_dependencies", |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 if (cld_version == 0 || cld_version == 2) { | 228 if (cld_version == 0 || cld_version == 2) { |
| 231 deps += [ "//third_party/cld_2" ] | 229 deps += [ "//third_party/cld_2" ] |
| 232 } | 230 } |
| 233 | 231 |
| 234 if (is_mac) { | 232 if (is_mac) { |
| 235 #['OS=="mac" and component!="shared_library"', { TODO(GYP) | 233 #['OS=="mac" and component!="shared_library"', { TODO(GYP) |
| 236 # 'includes': [ 'chrome_dll_bundle.gypi' ], | 234 # 'includes': [ 'chrome_dll_bundle.gypi' ], |
| 237 #}], | 235 #}], |
| 238 # TODO(GYP) Lots of other stuff in the OS=="mac" block. | 236 # TODO(GYP) Lots of other stuff in the OS=="mac" block. |
| 239 } | 237 } |
| 238 |
| 239 if (enable_plugins) { |
| 240 deps += [ "//pdf" ] |
| 241 } |
| 240 } | 242 } |
| 241 } | 243 } |
| 242 | 244 |
| 243 # GYP version: chromium_browser_dependencies variable in chrome.gyp | 245 # GYP version: chromium_browser_dependencies variable in chrome.gyp |
| 244 group("browser_dependencies") { | 246 group("browser_dependencies") { |
| 245 deps = [ | 247 deps = [ |
| 246 "//chrome/browser", | 248 "//chrome/browser", |
| 247 "//chrome/common", | 249 "//chrome/common", |
| 248 "//sync", | 250 "//sync", |
| 249 ] | 251 ] |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 "//chrome/browser/ui", | 690 "//chrome/browser/ui", |
| 689 "//chrome/child", | 691 "//chrome/child", |
| 690 "//chrome/plugin", | 692 "//chrome/plugin", |
| 691 "//chrome/renderer", | 693 "//chrome/renderer", |
| 692 "//chrome/utility", | 694 "//chrome/utility", |
| 693 "//components/enhanced_bookmarks", | 695 "//components/enhanced_bookmarks", |
| 694 "//content/public/app:browser", | 696 "//content/public/app:browser", |
| 695 ] | 697 ] |
| 696 } | 698 } |
| 697 } | 699 } |
| OLD | NEW |