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

Unified Diff: media/base/BUILD.gn

Issue 1405783002: Support desktop media pipeline on Android for GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified Opus Created 5 years, 2 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 | « media/BUILD.gn ('k') | media/blink/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 3565553d7523197eba2f08fe687ea53a78e0a85b..691e13054d527432c81580d228b713e482a09c07 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -220,13 +220,17 @@ source_set("base") {
if (media_use_ffmpeg) {
sources += [
- "audio_video_metadata_extractor.cc",
- "audio_video_metadata_extractor.h",
"container_names.cc",
"container_names.h",
- "media_file_checker.cc",
- "media_file_checker.h",
]
+ if (!is_android) {
+ sources += [
+ "audio_video_metadata_extractor.cc",
+ "audio_video_metadata_extractor.h",
+ "media_file_checker.cc",
+ "media_file_checker.h",
+ ]
+ }
deps += [ "//third_party/ffmpeg" ]
}
@@ -432,7 +436,9 @@ source_set("unittests") {
"//testing/gtest",
]
- if (media_use_ffmpeg) {
+ # Even if FFmpeg is enabled on Android we don't want these.
+ # TODO(watk): Refactor tests that could be made to run on Android.
+ if (media_use_ffmpeg && !is_android) {
sources += [
"audio_video_metadata_extractor_unittest.cc",
"media_file_checker_unittest.cc",
« no previous file with comments | « media/BUILD.gn ('k') | media/blink/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698