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

Unified Diff: media/media.gyp

Issue 10798010: Uses gyp "rules" rather than "actions" templates for the JNI generator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Typo on content_jni.gypi Created 8 years, 5 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/media_player_bridge.cc ('k') | net/android/network_change_notifier_android.cc » ('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 d8de37a0b0824030cf0762faf8c476da2a01568f..d1e50fd0cfafb70d03940396ed82ecf9ce0935a6 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1004,6 +1004,17 @@
['OS == "android"', {
'targets': [
{
+ 'target_name': 'player_android_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
+ ],
+ 'variables': {
+ 'jni_gen_dir': 'media',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
'target_name': 'player_android',
'type': 'static_library',
'sources': [
@@ -1012,29 +1023,11 @@
],
'dependencies': [
'../base/base.gyp:base',
+ 'player_android_jni_headers',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/media',
],
- 'actions': [
- {
- 'action_name': 'generate-jni-headers',
- 'inputs': [
- '../base/android/jni_generator/jni_generator.py',
- 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h',
- ],
- 'action': [
- 'python',
- '<(DEPTH)/base/android/jni_generator/jni_generator.py',
- '-o',
- '<@(_inputs)',
- '<@(_outputs)',
- ],
- },
- ],
},
{
'target_name': 'media_java',
« no previous file with comments | « media/base/android/media_player_bridge.cc ('k') | net/android/network_change_notifier_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698