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

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

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « media/audio_unittests.isolate ('k') | media/base/media.h » ('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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 if (media_use_ffmpeg) { 210 if (media_use_ffmpeg) {
211 sources += [ 211 sources += [
212 "audio_video_metadata_extractor.cc", 212 "audio_video_metadata_extractor.cc",
213 "audio_video_metadata_extractor.h", 213 "audio_video_metadata_extractor.h",
214 "container_names.cc", 214 "container_names.cc",
215 "container_names.h", 215 "container_names.h",
216 "media_file_checker.cc", 216 "media_file_checker.cc",
217 "media_file_checker.h", 217 "media_file_checker.h",
218 ] 218 ]
219 if (is_win) {
220 sources += [ "media_win.cc" ]
221 } else if (is_posix) {
222 sources += [ "media_posix.cc" ]
223 }
219 224
220 deps += [ "//third_party/ffmpeg" ] 225 deps += [ "//third_party/ffmpeg" ]
221 } 226 }
222 227
223 if (enable_browser_cdms) { 228 if (enable_browser_cdms) {
224 sources += [ 229 sources += [
225 "browser_cdm.cc", 230 "browser_cdm.cc",
226 "browser_cdm.h", 231 "browser_cdm.h",
227 "browser_cdm_factory.cc", 232 "browser_cdm_factory.cc",
228 "browser_cdm_factory.h", 233 "browser_cdm_factory.h",
229 ] 234 ]
230 } 235 }
231 236
232 if (is_android) { 237 if (is_android) {
238 sources += [ "media_stub.cc" ]
233 public_deps = [ 239 public_deps = [
234 "//media/base/android", 240 "//media/base/android",
235 "//media/base/android:media_java", 241 "//media/base/android:media_java",
236 "//media/base/android:media_jni_headers", 242 "//media/base/android:media_jni_headers",
237 "//media/base/android:video_capture_jni_headers", 243 "//media/base/android:video_capture_jni_headers",
238 ] 244 ]
239 allow_circular_includes_from += [ "//media/base/android" ] 245 allow_circular_includes_from += [ "//media/base/android" ]
240 } 246 }
241 247
242 if (is_linux && use_x11) { 248 if (is_linux && use_x11) {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 if (is_posix) { 532 if (is_posix) {
527 yasm_flags += [ "-DELF" ] 533 yasm_flags += [ "-DELF" ]
528 if (current_cpu == "x64") { 534 if (current_cpu == "x64") {
529 # TODO(ajwong): Why isn't this true in mac? 535 # TODO(ajwong): Why isn't this true in mac?
530 yasm_flags += [ "-DPIC" ] 536 yasm_flags += [ "-DPIC" ]
531 } 537 }
532 } 538 }
533 } 539 }
534 } 540 }
535 } 541 }
OLDNEW
« no previous file with comments | « media/audio_unittests.isolate ('k') | media/base/media.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698