Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: chrome/BUILD.gn

Issue 1978123002: Revert of media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 ":packed_extra_resources", 215 ":packed_extra_resources",
216 ":packed_resources", 216 ":packed_resources",
217 ] 217 ]
218 deps += [ 218 deps += [
219 "//components/startup_metric_utils/browser:lib", 219 "//components/startup_metric_utils/browser:lib",
220 220
221 # Precompiled plugins that need to get copied to the output directory. 221 # Precompiled plugins that need to get copied to the output directory.
222 # On Mac, internal plugins go inside the framework, so these 222 # On Mac, internal plugins go inside the framework, so these
223 # dependencies are on chrome.dll. 223 # dependencies are on chrome.dll.
224 "//third_party/adobe/flash:flapper_binaries", 224 "//third_party/adobe/flash:flapper_binaries",
225 "//third_party/widevine/cdm:widevinecdmadapter",
225 ] 226 ]
226 227
227 data_deps += [ "//third_party/widevine/cdm:widevinecdmadapter" ]
228
229 if (is_multi_dll_chrome) { 228 if (is_multi_dll_chrome) {
230 defines += [ "CHROME_MULTIPLE_DLL" ] 229 defines += [ "CHROME_MULTIPLE_DLL" ]
231 data_deps += [ ":chrome_child" ] 230 data_deps += [ ":chrome_child" ]
232 } 231 }
233 } 232 }
234 } # !is_android && !is_mac 233 } # !is_android && !is_mac
235 234
236 if (is_win) { 235 if (is_win) {
237 # This target is a forwarding target to compile the necessary DLLs used 236 # This target is a forwarding target to compile the necessary DLLs used
238 # by Chrome. 237 # by Chrome.
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1411 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1413 "//chrome/tools/build/linux/chrome-wrapper", 1412 "//chrome/tools/build/linux/chrome-wrapper",
1414 "//third_party/xdg-utils/scripts/xdg-mime", 1413 "//third_party/xdg-utils/scripts/xdg-mime",
1415 "//third_party/xdg-utils/scripts/xdg-settings", 1414 "//third_party/xdg-utils/scripts/xdg-settings",
1416 ] 1415 ]
1417 outputs = [ 1416 outputs = [
1418 "$root_out_dir/{{source_file_part}}", 1417 "$root_out_dir/{{source_file_part}}",
1419 ] 1418 ]
1420 } 1419 }
1421 } 1420 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698