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

Unified Diff: media/BUILD.gn

Issue 2848213003: Fix building FFMPEG into Android (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/filters/decoder_selector.h » ('j') | media/filters/decoder_selector.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 8d97ec513ba2e43f871c4a10b1db5d90b40fb9c7..5b92a791eb466f26cea37f1216049f259db6b6f8 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -377,17 +377,19 @@ component("media") {
}
if (disable_ffmpeg_video_decoders) {
- sources -= [
- "filters/decrypting_video_decoder.cc",
- "filters/decrypting_video_decoder.h",
- ]
+ sources -= [
+ "filters/decrypting_video_decoder.cc",
+ "filters/decrypting_video_decoder.h",
+ ]
}
if (is_android) {
- sources -= [
- "filters/decrypting_audio_decoder.cc",
- "filters/decrypting_audio_decoder.h",
- ]
+ if (disable_ffmpeg_video_decoders) {
+ sources -= [
+ "filters/decrypting_audio_decoder.cc",
+ "filters/decrypting_audio_decoder.h",
+ ]
+ }
sources += [
"filters/android/media_codec_audio_decoder.cc",
"filters/android/media_codec_audio_decoder.h",
@@ -659,9 +661,7 @@ source_set("unit_tests") {
]
if (!disable_ffmpeg_video_decoders) {
- sources += [
- "filters/ffmpeg_video_decoder_unittest.cc",
- ]
+ sources += [ "filters/ffmpeg_video_decoder_unittest.cc" ]
}
}
« no previous file with comments | « no previous file | media/filters/decoder_selector.h » ('j') | media/filters/decoder_selector.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698