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

Side by Side Diff: media/base/BUILD.gn

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month 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 | « media/BUILD.gn ('k') | media/base/android/BUILD.gn » ('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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.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/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 "audio_video_metadata_extractor.cc", 231 "audio_video_metadata_extractor.cc",
232 "audio_video_metadata_extractor.h", 232 "audio_video_metadata_extractor.h",
233 "media_file_checker.cc", 233 "media_file_checker.cc",
234 "media_file_checker.h", 234 "media_file_checker.h",
235 ] 235 ]
236 } 236 }
237 237
238 deps += [ "//third_party/ffmpeg" ] 238 deps += [ "//third_party/ffmpeg" ]
239 } 239 }
240 240
241 if (enable_browser_cdms) {
242 sources += [
243 "browser_cdm_factory.cc",
244 "browser_cdm_factory.h",
245 ]
246 }
247
248 if (is_android) { 241 if (is_android) {
249 public_deps = [ 242 public_deps = [
250 "//media/base/android", 243 "//media/base/android",
251 "//media/base/android:media_java", 244 "//media/base/android:media_java",
252 "//media/base/android:media_jni_headers", 245 "//media/base/android:media_jni_headers",
253 "//media/base/android:video_capture_jni_headers", 246 "//media/base/android:video_capture_jni_headers",
254 ] 247 ]
255 allow_circular_includes_from += [ "//media/base/android" ] 248 allow_circular_includes_from += [ "//media/base/android" ]
256 } 249 }
257 250
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 if (is_posix) { 532 if (is_posix) {
540 yasm_flags += [ "-DELF" ] 533 yasm_flags += [ "-DELF" ]
541 if (current_cpu == "x64") { 534 if (current_cpu == "x64") {
542 # TODO(ajwong): Why isn't this true in mac? 535 # TODO(ajwong): Why isn't this true in mac?
543 yasm_flags += [ "-DPIC" ] 536 yasm_flags += [ "-DPIC" ]
544 } 537 }
545 } 538 }
546 } 539 }
547 } 540 }
548 } 541 }
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698