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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 '<(PRODUCT_DIR)/lib.java/chromium_media.jar', 997 '<(PRODUCT_DIR)/lib.java/chromium_media.jar',
998 ], 998 ],
999 }, 999 },
1000 'includes': [ '../build/apk_test.gypi' ], 1000 'includes': [ '../build/apk_test.gypi' ],
1001 }, 1001 },
1002 ], 1002 ],
1003 }], 1003 }],
1004 ['OS == "android"', { 1004 ['OS == "android"', {
1005 'targets': [ 1005 'targets': [
1006 { 1006 {
1007 'target_name': 'player_android_jni_headers',
1008 'type': 'none',
1009 'sources': [
1010 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1011 ],
1012 'variables': {
1013 'jni_gen_dir': 'media',
1014 },
1015 'includes': [ '../build/jni_generator.gypi' ],
1016 },
1017 {
1007 'target_name': 'player_android', 1018 'target_name': 'player_android',
1008 'type': 'static_library', 1019 'type': 'static_library',
1009 'sources': [ 1020 'sources': [
1010 'base/android/media_player_bridge.cc', 1021 'base/android/media_player_bridge.cc',
1011 'base/android/media_player_bridge.h', 1022 'base/android/media_player_bridge.h',
1012 ], 1023 ],
1013 'dependencies': [ 1024 'dependencies': [
1014 '../base/base.gyp:base', 1025 '../base/base.gyp:base',
1026 'player_android_jni_headers',
1015 ], 1027 ],
1016 'include_dirs': [ 1028 'include_dirs': [
1017 '<(SHARED_INTERMEDIATE_DIR)/media', 1029 '<(SHARED_INTERMEDIATE_DIR)/media',
1018 ], 1030 ],
1019 'actions': [
1020 {
1021 'action_name': 'generate-jni-headers',
1022 'inputs': [
1023 '../base/android/jni_generator/jni_generator.py',
1024 'base/android/java/src/org/chromium/media/MediaPlayerListener.ja va',
1025 ],
1026 'outputs': [
1027 '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni. h',
1028 ],
1029 'action': [
1030 'python',
1031 '<(DEPTH)/base/android/jni_generator/jni_generator.py',
1032 '-o',
1033 '<@(_inputs)',
1034 '<@(_outputs)',
1035 ],
1036 },
1037 ],
1038 }, 1031 },
1039 { 1032 {
1040 'target_name': 'media_java', 1033 'target_name': 'media_java',
1041 'type': 'none', 1034 'type': 'none',
1042 'dependencies': [ '../base/base.gyp:base_java' ], 1035 'dependencies': [ '../base/base.gyp:base_java' ],
1043 'variables': { 1036 'variables': {
1044 'package_name': 'media', 1037 'package_name': 'media',
1045 'java_in_dir': 'base/android/java', 1038 'java_in_dir': 'base/android/java',
1046 }, 1039 },
1047 'includes': [ '../build/java.gypi' ], 1040 'includes': [ '../build/java.gypi' ],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1129 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1137 ], 1130 ],
1138 'sources': [ 1131 'sources': [
1139 'tools/media_bench/media_bench.cc', 1132 'tools/media_bench/media_bench.cc',
1140 ], 1133 ],
1141 }, 1134 },
1142 ], 1135 ],
1143 }] 1136 }]
1144 ], 1137 ],
1145 } 1138 }
OLDNEW
« 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