| 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/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") | 
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") | 
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") | 
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") | 
| 9 import("//build/config/locales.gni") | 9 import("//build/config/locales.gni") | 
| 10 import("//build/config/sanitizers/sanitizers.gni") | 10 import("//build/config/sanitizers/sanitizers.gni") | 
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 288     } | 288     } | 
| 289   } | 289   } | 
| 290 | 290 | 
| 291   shared_library("main_dll") { | 291   shared_library("main_dll") { | 
| 292     configs += [ "//build/config/compiler:wexit_time_destructors" ] | 292     configs += [ "//build/config/compiler:wexit_time_destructors" ] | 
| 293     defines = [] | 293     defines = [] | 
| 294     ldflags = [] | 294     ldflags = [] | 
| 295 | 295 | 
| 296     sources = [ | 296     sources = [ | 
| 297       "//base/win/dllmain.cc", | 297       "//base/win/dllmain.cc", | 
| 298       "app/chrome_dll.rc", |  | 
| 299       "app/chrome_dll_resource.h", |  | 
| 300       "app/chrome_main.cc", | 298       "app/chrome_main.cc", | 
| 301       "app/chrome_main_delegate.cc", | 299       "app/chrome_main_delegate.cc", | 
| 302       "app/chrome_main_delegate.h", | 300       "app/chrome_main_delegate.h", | 
| 303       "app/chrome_main_mac.h", | 301       "app/chrome_main_mac.h", | 
| 304       "app/chrome_main_mac.mm", | 302       "app/chrome_main_mac.mm", | 
| 305     ] | 303     ] | 
| 306 | 304 | 
| 307     deps = [ | 305     deps = [ | 
| 308       ":browser_dependencies", | 306       ":browser_dependencies", | 
| 309       "//build/config/sanitizers:deps", | 307       "//build/config/sanitizers:deps", | 
|  | 308       "//chrome/app:chrome_dll_resources", | 
| 310       "//chrome/app:command_ids", | 309       "//chrome/app:command_ids", | 
| 311       "//chrome/common:features", | 310       "//chrome/common:features", | 
| 312       "//third_party/cld", | 311       "//third_party/cld", | 
| 313     ] | 312     ] | 
| 314     if (is_win) { | 313     if (is_win) { | 
| 315       output_name = "chrome" | 314       output_name = "chrome" | 
| 316 | 315 | 
| 317       deps += [ | 316       deps += [ | 
| 318         ":chrome_dll_manifest", | 317         ":chrome_dll_manifest", | 
| 319         ":chrome_dll_version", | 318         ":chrome_dll_version", | 
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1158   } | 1157   } | 
| 1159 | 1158 | 
| 1160   if (!is_component_build) { | 1159   if (!is_component_build) { | 
| 1161     assert_no_deps = [ | 1160     assert_no_deps = [ | 
| 1162       # Blink and V8 should not be used in the browser process. In component | 1161       # Blink and V8 should not be used in the browser process. In component | 
| 1163       # build this is OK because all of content is linked into one library. | 1162       # build this is OK because all of content is linked into one library. | 
| 1164       # Note that the blink_headers target is OK, so we can't do a wildcard for | 1163       # Note that the blink_headers target is OK, so we can't do a wildcard for | 
| 1165       # all blink targets. | 1164       # all blink targets. | 
| 1166       "//third_party/WebKit/public:blink", | 1165       "//third_party/WebKit/public:blink", | 
| 1167       # TODO(brettw) bug 581766: V8 should not be linked into the browser | 1166       # TODO(brettw) bug 581766: V8 should not be linked into the browser | 
| 1168       # process, and then we can enable this. | 1167       # process, and then we can enable this. When testing whether you can | 
|  | 1168       # enable this, run with a non-component build. | 
| 1169       #"//v8/*", | 1169       #"//v8/*", | 
| 1170     ] | 1170     ] | 
| 1171   } | 1171   } | 
| 1172 } | 1172 } | 
| 1173 | 1173 | 
| 1174 # GYP version: chromium_child_dependencies variable in chrome.gyp | 1174 # GYP version: chromium_child_dependencies variable in chrome.gyp | 
| 1175 group("child_dependencies") { | 1175 group("child_dependencies") { | 
| 1176   public_deps = [ | 1176   public_deps = [ | 
| 1177     "//chrome/browser/devtools", | 1177     "//chrome/browser/devtools", | 
| 1178     "//chrome/child", | 1178     "//chrome/child", | 
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1582       "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1582       "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 
| 1583       "//chrome/tools/build/linux/chrome-wrapper", | 1583       "//chrome/tools/build/linux/chrome-wrapper", | 
| 1584       "//third_party/xdg-utils/scripts/xdg-mime", | 1584       "//third_party/xdg-utils/scripts/xdg-mime", | 
| 1585       "//third_party/xdg-utils/scripts/xdg-settings", | 1585       "//third_party/xdg-utils/scripts/xdg-settings", | 
| 1586     ] | 1586     ] | 
| 1587     outputs = [ | 1587     outputs = [ | 
| 1588       "$root_out_dir/{{source_file_part}}", | 1588       "$root_out_dir/{{source_file_part}}", | 
| 1589     ] | 1589     ] | 
| 1590   } | 1590   } | 
| 1591 } | 1591 } | 
| OLD | NEW | 
|---|