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

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

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

Powered by Google App Engine
This is Rietveld 408576698