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

Side by Side Diff: mojo/mojo.gyp

Issue 288963002: Android: cleans up jni_generator_ptr_type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « 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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['mojo_shell_debug_url != ""', { 8 ['mojo_shell_debug_url != ""', {
9 'defines': [ 9 'defines': [
10 'MOJO_SHELL_DEBUG=1', 10 'MOJO_SHELL_DEBUG=1',
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 'mojo_java_set_jni_headers', 680 'mojo_java_set_jni_headers',
681 ], 681 ],
682 'sources': [ 682 'sources': [
683 'android/javatests/src/org/chromium/mojo/system/CoreTest.java', 683 'android/javatests/src/org/chromium/mojo/system/CoreTest.java',
684 'android/system/src/org/chromium/mojo/system/CoreImpl.java', 684 'android/system/src/org/chromium/mojo/system/CoreImpl.java',
685 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java', 685 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java',
686 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java', 686 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
687 ], 687 ],
688 'variables': { 688 'variables': {
689 'jni_gen_package': 'mojo', 689 'jni_gen_package': 'mojo',
690 'jni_generator_ptr_type': 'long',
691 }, 690 },
692 'includes': [ '../build/jni_generator.gypi' ], 691 'includes': [ '../build/jni_generator.gypi' ],
693 }, 692 },
694 { 693 {
695 'target_name': 'mojo_system_java', 694 'target_name': 'mojo_system_java',
696 'type': 'none', 695 'type': 'none',
697 'dependencies': [ 696 'dependencies': [
698 '../base/base.gyp:base_java', 697 '../base/base.gyp:base_java',
699 'mojo_public_java', 698 'mojo_public_java',
700 ], 699 ],
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 'variables': { 765 'variables': {
767 'java_in_dir': '<(DEPTH)/mojo/services/native_viewport/android', 766 'java_in_dir': '<(DEPTH)/mojo/services/native_viewport/android',
768 }, 767 },
769 'includes': [ '../build/java.gypi' ], 768 'includes': [ '../build/java.gypi' ],
770 }, 769 },
771 { 770 {
772 'target_name': 'mojo_java_set_jni_headers', 771 'target_name': 'mojo_java_set_jni_headers',
773 'type': 'none', 772 'type': 'none',
774 'variables': { 773 'variables': {
775 'jni_gen_package': 'mojo', 774 'jni_gen_package': 'mojo',
776 'jni_generator_ptr_type': 'long',
777 'input_java_class': 'java/util/HashSet.class', 775 'input_java_class': 'java/util/HashSet.class',
778 }, 776 },
779 'includes': [ '../build/jar_file_jni_generator.gypi' ], 777 'includes': [ '../build/jar_file_jni_generator.gypi' ],
780 }, 778 },
781 { 779 {
782 'target_name': 'libmojo_shell', 780 'target_name': 'libmojo_shell',
783 'type': 'shared_library', 781 'type': 'shared_library',
784 'dependencies': [ 782 'dependencies': [
785 '../base/base.gyp:base', 783 '../base/base.gyp:base',
786 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 784 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 'aura/screen_mojo.cc', 878 'aura/screen_mojo.cc',
881 'aura/screen_mojo.h', 879 'aura/screen_mojo.h',
882 'aura/window_tree_host_mojo.cc', 880 'aura/window_tree_host_mojo.cc',
883 'aura/window_tree_host_mojo.h', 881 'aura/window_tree_host_mojo.h',
884 ], 882 ],
885 }, 883 },
886 ], 884 ],
887 }], 885 }],
888 ], 886 ],
889 } 887 }
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