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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_common.gypi

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address danakj@'s concern Created 6 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
« content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('K') | « content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('k') | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 2c54e773bc84c6a795295e250c25c0d66ba5973e..d8c1ee006a74d78e8c0f2b94efb9cdd9a3ede134 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -675,7 +675,7 @@
],
},
}],
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+ ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', {
danakj 2014/06/19 15:56:26 and here?
'sources': [
'common/gpu/media/h264_dpb.cc',
'common/gpu/media/h264_dpb.h',
« content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('K') | « content/common/sandbox_linux/bpf_gpu_policy_linux.cc ('k') | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698