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

Unified Diff: build/gn_migration.gypi

Issue 1541513002: Switch from build-time to run-time flags for Project Spitzer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « build/common.gypi ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index fd8a40045ffc72702648b8f910bdf8a364ab4933..93d1e86659f6c04a5d82dbe19e6301cc0083fd6b 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -374,7 +374,7 @@
'../ui/views/examples/examples.gyp:views_examples_with_content_exe',
],
}],
- ['media_use_ffmpeg==1', {
+ ['media_use_ffmpeg==1 and OS!="android"', {
'dependencies': [
'../media/media.gyp:ffmpeg_regression_tests',
],
« no previous file with comments | « build/common.gypi ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698