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

Side by Side Diff: media/media.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | net/net.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 'player_android_jni_headers', 1073 'player_android_jni_headers',
1074 ], 1074 ],
1075 'include_dirs': [ 1075 'include_dirs': [
1076 '<(SHARED_INTERMEDIATE_DIR)/media', 1076 '<(SHARED_INTERMEDIATE_DIR)/media',
1077 ], 1077 ],
1078 }, 1078 },
1079 { 1079 {
1080 'target_name': 'media_java', 1080 'target_name': 'media_java',
1081 'type': 'none', 1081 'type': 'none',
1082 'dependencies': [ 1082 'dependencies': [
1083 '../base/base.gyp:base_java', 1083 '../base/base.gyp:base',
1084 ], 1084 ],
1085 'export_dependent_settings': [ 1085 'export_dependent_settings': [
1086 '../base/base.gyp:base_java', 1086 '../base/base.gyp:base',
1087 ], 1087 ],
1088 'variables': { 1088 'variables': {
1089 'package_name': 'media', 1089 'package_name': 'media',
1090 'java_in_dir': 'base/android/java', 1090 'java_in_dir': 'base/android/java',
1091 }, 1091 },
1092 'includes': [ '../build/java.gypi' ], 1092 'includes': [ '../build/java.gypi' ],
1093 }, 1093 },
1094 1094
1095 ], 1095 ],
1096 }], 1096 }],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 'media', 1183 'media',
1184 ], 1184 ],
1185 'sources': [ 1185 'sources': [
1186 'tools/media_bench/media_bench.cc', 1186 'tools/media_bench/media_bench.cc',
1187 ], 1187 ],
1188 }, 1188 },
1189 ], 1189 ],
1190 }] 1190 }]
1191 ], 1191 ],
1192 } 1192 }
OLDNEW
« no previous file with comments | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698