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

Unified Diff: media/media.gyp

Issue 10377059: Android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps so builds on clean machine Created 8 years, 7 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 | « media/base/android/java/media.xml ('k') | net/android/java/net.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index a084ab67716dbfc180694e34fbd1cb7811dba3bb..4bee26290cfa893905374f9d66f2a4546523efa6 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -937,6 +937,7 @@
],
'dependencies': [
'../base/base.gyp:base',
+ 'media_java',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/media',
@@ -961,6 +962,17 @@
},
],
},
+ {
+ 'target_name': 'media_java',
+ 'type': 'none',
+ 'dependencies': [ '../base/base.gyp:base_java' ],
+ 'variables': {
+ 'package_name': 'media',
+ 'java_in_dir': 'base/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+
],
}, { # OS != "android"'
# Android does not use ffmpeg, so disable the targets which require it.
« no previous file with comments | « media/base/android/java/media.xml ('k') | net/android/java/net.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698