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

Unified Diff: build/common.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 | « DEPS ('k') | build/gn_migration.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d829ae4141a84a3edfc57772c03e009b8b86bfcc..b41f8903268b386e78e396503856a9a4290da01d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1882,7 +1882,6 @@
}],
['chromecast==1', {
'enable_mpeg2ts_stream_parser%': 1,
- 'ffmpeg_branding%': 'ChromeOS',
'use_custom_freetype%': 0,
'use_playready%': 0,
'conditions': [
@@ -1891,6 +1890,11 @@
'arm_tune%': 'cortex-a9',
'arm_thumb%': 1,
}],
+ # TODO(dalecurtis): What audio codecs does Chromecast want here? Sort
+ # out and add configs if necessary. http://crbug.com/570754
+ ['OS!="android"', {
+ 'ffmpeg_branding%': 'ChromeOS',
+ }],
],
}],
['OS=="linux"', {
« no previous file with comments | « DEPS ('k') | build/gn_migration.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698