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/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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 ":packed_extra_resources", | 216 ":packed_extra_resources", |
| 217 ":packed_resources", | 217 ":packed_resources", |
| 218 ] | 218 ] |
| 219 deps += [ | 219 deps += [ |
| 220 "//components/startup_metric_utils/browser:lib", | 220 "//components/startup_metric_utils/browser:lib", |
| 221 | 221 |
| 222 # Precompiled plugins that need to get copied to the output directory. | 222 # Precompiled plugins that need to get copied to the output directory. |
| 223 # On Mac, internal plugins go inside the framework, so these | 223 # On Mac, internal plugins go inside the framework, so these |
| 224 # dependencies are on chrome.dll. | 224 # dependencies are on chrome.dll. |
| 225 "//third_party/adobe/flash:flapper_binaries", | 225 "//third_party/adobe/flash:flapper_binaries", |
| 226 "//third_party/widevine/cdm:widevinecdmadapter", | |
| 227 ] | 226 ] |
| 228 | 227 |
| 228 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ] | |
|
ddorwin
2016/05/06 22:23:48
What is the reason for this change? Note that the
xhwang
2016/05/09 20:59:02
widevinecdmadapter is a shared_library, the curren
ddorwin
2016/05/09 23:12:56
Thanks. I wonder whether the flapper_binaries shou
xhwang
2016/05/09 23:50:05
flapper_binaries is "copy" action [1], which will
| |
| 229 | |
| 229 if (is_multi_dll_chrome) { | 230 if (is_multi_dll_chrome) { |
| 230 defines += [ "CHROME_MULTIPLE_DLL" ] | 231 defines += [ "CHROME_MULTIPLE_DLL" ] |
| 231 data_deps += [ ":chrome_child" ] | 232 data_deps += [ ":chrome_child" ] |
| 232 } | 233 } |
| 233 } | 234 } |
| 234 } # !is_android && !is_mac | 235 } # !is_android && !is_mac |
| 235 | 236 |
| 236 if (is_mac) { | 237 if (is_mac) { |
| 237 if (is_component_build) { | 238 if (is_component_build) { |
| 238 # On Mac component builds, this target is the bundle, and the main dll is | 239 # On Mac component builds, this target is the bundle, and the main dll is |
| (...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1372 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1373 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1373 "//chrome/tools/build/linux/chrome-wrapper", | 1374 "//chrome/tools/build/linux/chrome-wrapper", |
| 1374 "//third_party/xdg-utils/scripts/xdg-mime", | 1375 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1375 "//third_party/xdg-utils/scripts/xdg-settings", | 1376 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1376 ] | 1377 ] |
| 1377 outputs = [ | 1378 outputs = [ |
| 1378 "$root_out_dir/{{source_file_part}}", | 1379 "$root_out_dir/{{source_file_part}}", |
| 1379 ] | 1380 ] |
| 1380 } | 1381 } |
| 1381 } | 1382 } |
| OLD | NEW |