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

Side by Side Diff: mojo/mojo.gyp

Issue 111493006: Have jni_generator.gypi specify include_dirs to dependent targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove export_dependent_settings Created 7 years 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 | « media/media.gyp ('k') | net/net.gyp » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 }, 8 },
9 'includes': [ 9 'includes': [
10 'mojo_apps.gypi', 10 'mojo_apps.gypi',
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 'input_java_class': 'java/util/HashSet.class', 329 'input_java_class': 'java/util/HashSet.class',
330 }, 330 },
331 'includes': [ '../build/jar_file_jni_generator.gypi' ], 331 'includes': [ '../build/jar_file_jni_generator.gypi' ],
332 }, 332 },
333 { 333 {
334 'target_name': 'mojo_jni_headers', 334 'target_name': 'mojo_jni_headers',
335 'type': 'none', 335 'type': 'none',
336 'dependencies': [ 336 'dependencies': [
337 'mojo_java_set_jni_headers', 337 'mojo_java_set_jni_headers',
338 ], 338 ],
339 'direct_dependent_settings': {
340 'include_dirs': [
341 '<(SHARED_INTERMEDIATE_DIR)/mojo',
342 ],
343 },
344 'sources': [ 339 'sources': [
345 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java', 340 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java',
346 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java', 341 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
347 ], 342 ],
348 'variables': { 343 'variables': {
349 'jni_gen_package': 'mojo' 344 'jni_gen_package': 'mojo'
350 }, 345 },
351 'includes': [ '../build/jni_generator.gypi' ], 346 'includes': [ '../build/jni_generator.gypi' ],
352 }, 347 },
353 { 348 {
(...skipping 28 matching lines...) Expand all
382 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', 377 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
383 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', 378 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
384 'native_lib_target': 'libmojo_shell', 379 'native_lib_target': 'libmojo_shell',
385 }, 380 },
386 'includes': [ '../build/java_apk.gypi' ], 381 'includes': [ '../build/java_apk.gypi' ],
387 } 382 }
388 ], 383 ],
389 }], 384 }],
390 ], 385 ],
391 } 386 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698