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

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

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing mention of ffmpeg shared lib from various config/gyp/installer files Created 5 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
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 "key_system_info.h", 103 "key_system_info.h",
104 "key_systems.cc", 104 "key_systems.cc",
105 "key_systems.h", 105 "key_systems.h",
106 "key_systems.h", 106 "key_systems.h",
107 "key_systems_support_uma.cc", 107 "key_systems_support_uma.cc",
108 "key_systems_support_uma.h", 108 "key_systems_support_uma.h",
109 "media.cc", 109 "media.cc",
110 "media.h", 110 "media.h",
111 "media_client.cc", 111 "media_client.cc",
112 "media_client.h", 112 "media_client.h",
113 "media_init.cc",
113 "media_keys.cc", 114 "media_keys.cc",
114 "media_keys.h", 115 "media_keys.h",
115 "media_log.cc", 116 "media_log.cc",
116 "media_log.h", 117 "media_log.h",
117 "media_log_event.h", 118 "media_log_event.h",
118 "media_permission.cc", 119 "media_permission.cc",
119 "media_permission.h", 120 "media_permission.h",
120 "media_switches.cc", 121 "media_switches.cc",
121 "media_switches.h", 122 "media_switches.h",
122 "moving_average.cc", 123 "moving_average.cc",
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 207
207 if (media_use_ffmpeg) { 208 if (media_use_ffmpeg) {
208 sources += [ 209 sources += [
209 "audio_video_metadata_extractor.cc", 210 "audio_video_metadata_extractor.cc",
210 "audio_video_metadata_extractor.h", 211 "audio_video_metadata_extractor.h",
211 "container_names.cc", 212 "container_names.cc",
212 "container_names.h", 213 "container_names.h",
213 "media_file_checker.cc", 214 "media_file_checker.cc",
214 "media_file_checker.h", 215 "media_file_checker.h",
215 ] 216 ]
216 if (is_win) {
217 sources += [ "media_win.cc" ]
218 } else if (is_posix) {
219 sources += [ "media_posix.cc" ]
220 }
221 217
222 deps += [ "//third_party/ffmpeg" ] 218 deps += [ "//third_party/ffmpeg" ]
223 } 219 }
224 220
225 if (enable_browser_cdms) { 221 if (enable_browser_cdms) {
226 sources += [ 222 sources += [
227 "browser_cdm.cc", 223 "browser_cdm.cc",
228 "browser_cdm.h", 224 "browser_cdm.h",
229 "browser_cdm_factory.cc", 225 "browser_cdm_factory.cc",
230 "browser_cdm_factory.h", 226 "browser_cdm_factory.h",
231 ] 227 ]
232 } 228 }
233 229
234 if (is_android) { 230 if (is_android) {
235 sources += [ "media_stub.cc" ] 231 sources += [ "media_init_stub.cc" ]
232 sources -= [ "media_init.cc" ]
236 public_deps = [ 233 public_deps = [
237 "//media/base/android", 234 "//media/base/android",
238 "//media/base/android:media_java", 235 "//media/base/android:media_java",
239 "//media/base/android:media_jni_headers", 236 "//media/base/android:media_jni_headers",
240 "//media/base/android:video_capture_jni_headers", 237 "//media/base/android:video_capture_jni_headers",
241 ] 238 ]
242 allow_circular_includes_from += [ "//media/base/android" ] 239 allow_circular_includes_from += [ "//media/base/android" ]
243 } 240 }
244 241
245 if (is_linux && use_x11) { 242 if (is_linux && use_x11) {
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 if (is_posix) { 522 if (is_posix) {
526 yasm_flags += [ "-DELF" ] 523 yasm_flags += [ "-DELF" ]
527 if (current_cpu == "x64") { 524 if (current_cpu == "x64") {
528 # TODO(ajwong): Why isn't this true in mac? 525 # TODO(ajwong): Why isn't this true in mac?
529 yasm_flags += [ "-DPIC" ] 526 yasm_flags += [ "-DPIC" ]
530 } 527 }
531 } 528 }
532 } 529 }
533 } 530 }
534 } 531 }
OLDNEW
« no previous file with comments | « content/content_unittests.isolate ('k') | media/base/media.h » ('j') | media/base/media.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698