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

Side by Side Diff: content/content.gyp

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 years, 2 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
« no previous file with comments | « chrome/chrome_android.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »
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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 { 279 {
280 'target_name': 'content_java', 280 'target_name': 'content_java',
281 'type': 'none', 281 'type': 'none',
282 'dependencies': [ 282 'dependencies': [
283 '../base/base.gyp:base', 283 '../base/base.gyp:base',
284 '../net/net.gyp:net', 284 '../net/net.gyp:net',
285 '../ui/ui.gyp:ui_java', 285 '../ui/ui.gyp:ui_java',
286 'common_aidl', 286 'common_aidl',
287 'content_common', 287 'content_common',
288 ], 288 ],
289 'export_dependent_settings': [
290 '../base/base.gyp:base',
291 '../net/net.gyp:net',
292 '../ui/ui.gyp:ui_java',
293 ],
294 'variables': { 289 'variables': {
295 'package_name': 'content', 290 'package_name': 'content',
296 'java_in_dir': '../content/public/android/java', 291 'java_in_dir': '../content/public/android/java',
297 }, 292 },
298 'includes': [ '../build/java.gypi' ], 293 'includes': [ '../build/java.gypi' ],
299 }, 294 },
300 { 295 {
301 'target_name': 'surface_texture_jni_headers', 296 'target_name': 'surface_texture_jni_headers',
302 'type': 'none', 297 'type': 'none',
303 'variables': { 298 'variables': {
304 'jni_gen_dir': 'content', 299 'jni_gen_dir': 'content',
305 'input_java_class': 'android/graphics/SurfaceTexture.class', 300 'input_java_class': 'android/graphics/SurfaceTexture.class',
306 'input_jar_file': '<(android_sdk)/android.jar', 301 'input_jar_file': '<(android_sdk)/android.jar',
307 }, 302 },
308 'includes': [ '../build/jar_file_jni_generator.gypi' ], 303 'includes': [ '../build/jar_file_jni_generator.gypi' ],
309 }, 304 },
310 { 305 {
311 'target_name': 'content_jni_headers', 306 'target_name': 'content_jni_headers',
312 'type': 'none', 307 'type': 'none',
313 'dependencies': [ 308 'dependencies': [
314 'surface_texture_jni_headers', 309 'surface_texture_jni_headers',
315 ], 310 ],
316 'includes': [ 'content_jni.gypi' ], 311 'includes': [ 'content_jni.gypi' ],
317 }, 312 },
318 ], 313 ],
319 }], # OS == "android" 314 }], # OS == "android"
320 ], 315 ],
321 } 316 }
OLDNEW
« no previous file with comments | « chrome/chrome_android.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698