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

Unified Diff: services/BUILD.gn

Issue 1928643002: Remove media from fnl to fix build. (Closed) Base URL: https://github.com/domokit/mojo.git@fix1
Patch Set: rebased Created 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/BUILD.gn
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 6f58dea261bf4e2477ace94b8a5df3edb5dced9e..8254c5e773bb9b72daade83ae0c9c5f90b4d28e8 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -17,13 +17,17 @@ group("services") {
"//services/http_server",
"//services/icu_data",
"//services/log",
- "//services/media",
"//services/native_support",
"//services/prediction",
"//services/test_service:bindings",
"//services/tracing",
]
+ # TODO: fix ffmpeg build
+ if (!is_fnl) {
+ deps += [ "//services/media" ]
+ }
+
if (is_android) {
deps += [
"//services/camera",
@@ -78,11 +82,15 @@ group("tests") {
"//services/clipboard:apptests",
"//services/gfx/compositor:apptests",
"//services/http_server:apptests",
- "//services/media/framework:apptests",
"//services/native_support:apptests",
"//services/prediction:apptests",
]
+ # TODO: fix ffmpeg build
+ if (!is_fnl) {
+ deps += [ "//services/media/framework:apptests" ]
+ }
+
if (!is_android) {
deps += [ "//services/authentication:apptests" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698