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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Created 4 years, 2 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 | « chrome/DEPS ('k') | 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/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//build/split_static_library.gni") 9 import("//build/split_static_library.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
11 import("//components/os_crypt/features.gni") 11 import("//components/os_crypt/features.gni")
12 import("//media/media_options.gni") 12 import("//media/media_options.gni")
13 import("//ppapi/features/features.gni")
14 import("//third_party/protobuf/proto_library.gni") 13 import("//third_party/protobuf/proto_library.gni")
15 14
16 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 15 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
17 # produces a conflict for the "grit" template so we have to only include one. 16 # produces a conflict for the "grit" template so we have to only include one.
18 if (is_android) { 17 if (is_android) {
19 import("//build/config/android/rules.gni") 18 import("//build/config/android/rules.gni")
20 } else { 19 } else {
21 import("//tools/grit/grit_rule.gni") 20 import("//tools/grit/grit_rule.gni")
22 } 21 }
23 22
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1438 "//third_party/icu", 1437 "//third_party/icu",
1439 "//third_party/kasko", 1438 "//third_party/kasko",
1440 "//third_party/leveldatabase", 1439 "//third_party/leveldatabase",
1441 "//third_party/libaddressinput", 1440 "//third_party/libaddressinput",
1442 "//third_party/libjingle", 1441 "//third_party/libjingle",
1443 "//third_party/libxml", 1442 "//third_party/libxml",
1444 "//third_party/libyuv", 1443 "//third_party/libyuv",
1445 "//third_party/re2", 1444 "//third_party/re2",
1446 "//third_party/smhasher:cityhash", 1445 "//third_party/smhasher:cityhash",
1447 "//third_party/webrtc/modules/desktop_capture", 1446 "//third_party/webrtc/modules/desktop_capture",
1448 "//third_party/widevine/cdm:headers", 1447 "//third_party/widevine/cdm:version_h",
1449 "//third_party/zlib", 1448 "//third_party/zlib",
1450 "//third_party/zlib:compression_utils", 1449 "//third_party/zlib:compression_utils",
1451 "//third_party/zlib:minizip", 1450 "//third_party/zlib:minizip",
1452 "//third_party/zlib:zip", 1451 "//third_party/zlib:zip",
1453 "//ui/base", 1452 "//ui/base",
1454 "//ui/base:ui_data_pack", 1453 "//ui/base:ui_data_pack",
1455 "//ui/base/ime", 1454 "//ui/base/ime",
1456 "//ui/events:events_base", 1455 "//ui/events:events_base",
1457 "//ui/gfx", 1456 "//ui/gfx",
1458 "//ui/gfx/geometry", 1457 "//ui/gfx/geometry",
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 "renderer_host/pepper/pepper_flash_clipboard_message_filter.h", 1913 "renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
1915 "renderer_host/pepper/pepper_flash_drm_host.cc", 1914 "renderer_host/pepper/pepper_flash_drm_host.cc",
1916 "renderer_host/pepper/pepper_flash_drm_host.h", 1915 "renderer_host/pepper/pepper_flash_drm_host.h",
1917 "renderer_host/pepper/pepper_isolated_file_system_message_filter.cc", 1916 "renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
1918 "renderer_host/pepper/pepper_isolated_file_system_message_filter.h", 1917 "renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
1919 "renderer_host/pepper/pepper_output_protection_message_filter.cc", 1918 "renderer_host/pepper/pepper_output_protection_message_filter.cc",
1920 "renderer_host/pepper/pepper_output_protection_message_filter.h", 1919 "renderer_host/pepper/pepper_output_protection_message_filter.h",
1921 ] 1920 ]
1922 deps += [ 1921 deps += [
1923 "//components/pdf/browser", 1922 "//components/pdf/browser",
1924 "//ppapi/features",
1925 "//ppapi/proxy:ipc", 1923 "//ppapi/proxy:ipc",
1926 "//third_party/adobe/flash:flapper_version_h", 1924 "//third_party/adobe/flash:flapper_version_h",
1927 ] 1925 ]
1928 } 1926 }
1929 if (safe_browsing_mode != 0) { 1927 if (safe_browsing_mode != 0) {
1930 # "Safe Browsing Basic" files used for safe browsing in full mode 1928 # "Safe Browsing Basic" files used for safe browsing in full mode
1931 # (safe_browsing=1) and mobile (=2) 1929 # (safe_browsing=1) and mobile (=2)
1932 sources += [ 1930 sources += [
1933 "loader/data_reduction_proxy_resource_throttle_android.cc", 1931 "loader/data_reduction_proxy_resource_throttle_android.cc",
1934 "loader/data_reduction_proxy_resource_throttle_android.h", 1932 "loader/data_reduction_proxy_resource_throttle_android.h",
(...skipping 2353 matching lines...) Expand 10 before | Expand all | Expand 10 after
4288 # linking all of the test support. 4286 # linking all of the test support.
4289 static_library("pepper_cdm_test_constants") { 4287 static_library("pepper_cdm_test_constants") {
4290 testonly = true 4288 testonly = true
4291 visibility = [ "//chrome/*" ] 4289 visibility = [ "//chrome/*" ]
4292 sources = [ 4290 sources = [
4293 "media/pepper_cdm_test_constants.cc", 4291 "media/pepper_cdm_test_constants.cc",
4294 "media/pepper_cdm_test_constants.h", 4292 "media/pepper_cdm_test_constants.h",
4295 ] 4293 ]
4296 } 4294 }
4297 } 4295 }
OLDNEW
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698