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

Unified Diff: media/BUILD.gn

Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable warning 4267 in Win capture.gyp (probs. lost in the previous relanding). Rebase Created 4 years, 6 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/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index fb4c400312c297392e4ecbd38cb6fc9f2cf3c35e..99b66f6e76eabe0b260bc6de5302f7307d1b174e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -337,8 +337,6 @@ component("media") {
deps += [
"//media/base/android",
"//media/base/android:media_jni_headers",
- "//media/capture/video/android:capture_java",
- "//media/capture/video/android:capture_jni_headers",
]
# Only 64 bit builds are using android-21 NDK library, check common.gypi
@@ -362,6 +360,11 @@ component("media") {
if (is_mac) {
public_deps += [ "//media/base/mac" ]
+ libs += [
+ "CoreFoundation.framework",
+ "CoreGraphics.framework",
+ "Foundation.framework",
+ ]
}
if (is_ios) {
@@ -370,12 +373,6 @@ component("media") {
if (is_win) {
deps += [ "//media/base/win" ]
- libs += [
- "mf.lib",
- "mfplat.lib",
- "mfreadwrite.lib",
- "mfuuid.lib",
- ]
}
if (proprietary_codecs) {
@@ -462,7 +459,6 @@ component("media") {
":shared_memory_support",
"//media/audio",
"//media/base",
- "//media/capture",
"//third_party/opus",
]
@@ -597,6 +593,8 @@ test("media_unittests") {
"//media/audio:unittests",
"//media/base:test_support",
"//media/base:unittests",
+
+ # TODO(mcasas): Remove the capture sources after https://crbug.com/618718.
"//media/capture:unittests",
"//media/test:pipeline_integration_tests",
"//skia", # Direct dependency required to inherit config.

Powered by Google App Engine
This is Rietveld 408576698