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

Unified Diff: media/blink/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/base/BUILD.gn ('k') | media/cdm/ppapi/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/BUILD.gn
diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn
index a805c42fca8cf76c8de93a73bf0b66013c72dc3a..eb0661b55fa57475ab023274a0ffa8fbc944a5f6 100644
--- a/media/blink/BUILD.gn
+++ b/media/blink/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//media/media_options.gni")
import("//testing/test.gni")
component("blink") {
@@ -40,8 +41,6 @@ component("blink") {
"cdm_result_promise_helper.h",
"cdm_session_adapter.cc",
"cdm_session_adapter.h",
- "encrypted_media_player_support.cc",
- "encrypted_media_player_support.h",
"key_system_config_selector.cc",
"key_system_config_selector.h",
"new_session_cdm_result_promise.cc",
@@ -63,8 +62,6 @@ component("blink") {
"webinbandtexttrack_impl.cc",
"webinbandtexttrack_impl.h",
"webmediaplayer_delegate.h",
- "webmediaplayer_impl.cc",
- "webmediaplayer_impl.h",
"webmediaplayer_params.cc",
"webmediaplayer_params.h",
"webmediaplayer_util.cc",
@@ -75,8 +72,8 @@ component("blink") {
"websourcebuffer_impl.h",
]
- if (is_android) {
- sources -= [
+ if (media_use_ffmpeg || !is_android) {
+ sources += [
"encrypted_media_player_support.cc",
"encrypted_media_player_support.h",
"webmediaplayer_impl.cc",
« no previous file with comments | « media/base/BUILD.gn ('k') | media/cdm/ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698