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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index a728cfa27039f72f81e4458354440c527f78f7e5..716bd8fe9e11472830f1ad2899e20a939c1ccc21 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -110,6 +110,7 @@ source_set("base") {
"media.h",
"media_client.cc",
"media_client.h",
+ "media_init.cc",
"media_keys.cc",
"media_keys.h",
"media_log.cc",
@@ -213,11 +214,6 @@ source_set("base") {
"media_file_checker.cc",
"media_file_checker.h",
]
- if (is_win) {
- sources += [ "media_win.cc" ]
- } else if (is_posix) {
- sources += [ "media_posix.cc" ]
- }
deps += [ "//third_party/ffmpeg" ]
}
@@ -232,7 +228,8 @@ source_set("base") {
}
if (is_android) {
- sources += [ "media_stub.cc" ]
+ sources += [ "media_init_stub.cc" ]
+ sources -= [ "media_init.cc" ]
public_deps = [
"//media/base/android",
"//media/base/android:media_java",
« 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