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

Unified Diff: content/content_common.gypi

Issue 11973010: AndroidVDA by using Android's MediaCodec API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply xhwang's comment. Created 7 years, 10 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 | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
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 59ddb957d7772ca6620e6219e0ded92052da847a..4183cd8a0661011fa718ffaaca2bf5ba1823259c 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -487,6 +487,21 @@
'../gpu/gpu.gyp:command_buffer_service',
],
}],
+ ['OS=="android"', {
+ 'dependencies': [
+ '../media/media.gyp:media',
+ ],
+ 'sources': [
+ 'common/gpu/media/android_video_decode_accelerator.cc',
+ 'common/gpu/media/android_video_decode_accelerator.h',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lEGL',
+ '-lGLESv2',
piman 2013/02/28 22:02:56 This is rather unusual, we shouldn't be linking di
dwkang1 2013/02/28 22:36:28 Removed.
dwkang1 2013/02/28 22:55:42 Oh, I misunderstood your comment. ui/gl/gl.gyp:gl
+ ],
+ },
+ }],
['target_arch=="arm" and chromeos == 1', {
'dependencies': [
'../media/media.gyp:media',
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698