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

Side by Side Diff: trunk/src/mojo/mojo.gyp

Issue 292433004: Revert 270750 "Android: cleans up jni_generator_ptr_type." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/media/media.gyp ('k') | trunk/src/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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 'mojo_java_set_jni_headers', 681 'mojo_java_set_jni_headers',
682 ], 682 ],
683 'sources': [ 683 'sources': [
684 'android/javatests/src/org/chromium/mojo/system/CoreTest.java', 684 'android/javatests/src/org/chromium/mojo/system/CoreTest.java',
685 'android/system/src/org/chromium/mojo/system/CoreImpl.java', 685 'android/system/src/org/chromium/mojo/system/CoreImpl.java',
686 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java', 686 'services/native_viewport/android/src/org/chromium/mojo/NativeViewpo rtAndroid.java',
687 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java', 687 'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
688 ], 688 ],
689 'variables': { 689 'variables': {
690 'jni_gen_package': 'mojo', 690 'jni_gen_package': 'mojo',
691 'jni_generator_ptr_type': 'long',
691 }, 692 },
692 'includes': [ '../build/jni_generator.gypi' ], 693 'includes': [ '../build/jni_generator.gypi' ],
693 }, 694 },
694 { 695 {
695 'target_name': 'mojo_system_java', 696 'target_name': 'mojo_system_java',
696 'type': 'none', 697 'type': 'none',
697 'dependencies': [ 698 'dependencies': [
698 '../base/base.gyp:base_java', 699 '../base/base.gyp:base_java',
699 'mojo_public_java', 700 'mojo_public_java',
700 ], 701 ],
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 'variables': { 769 'variables': {
769 'java_in_dir': '<(DEPTH)/mojo/services/native_viewport/android', 770 'java_in_dir': '<(DEPTH)/mojo/services/native_viewport/android',
770 }, 771 },
771 'includes': [ '../build/java.gypi' ], 772 'includes': [ '../build/java.gypi' ],
772 }, 773 },
773 { 774 {
774 'target_name': 'mojo_java_set_jni_headers', 775 'target_name': 'mojo_java_set_jni_headers',
775 'type': 'none', 776 'type': 'none',
776 'variables': { 777 'variables': {
777 'jni_gen_package': 'mojo', 778 'jni_gen_package': 'mojo',
779 'jni_generator_ptr_type': 'long',
778 'input_java_class': 'java/util/HashSet.class', 780 'input_java_class': 'java/util/HashSet.class',
779 }, 781 },
780 'includes': [ '../build/jar_file_jni_generator.gypi' ], 782 'includes': [ '../build/jar_file_jni_generator.gypi' ],
781 }, 783 },
782 { 784 {
783 'target_name': 'libmojo_shell', 785 'target_name': 'libmojo_shell',
784 'type': 'shared_library', 786 'type': 'shared_library',
785 'dependencies': [ 787 'dependencies': [
786 '../base/base.gyp:base', 788 '../base/base.gyp:base',
787 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 789 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 'aura/screen_mojo.cc', 883 'aura/screen_mojo.cc',
882 'aura/screen_mojo.h', 884 'aura/screen_mojo.h',
883 'aura/window_tree_host_mojo.cc', 885 'aura/window_tree_host_mojo.cc',
884 'aura/window_tree_host_mojo.h', 886 'aura/window_tree_host_mojo.h',
885 ], 887 ],
886 }, 888 },
887 ], 889 ],
888 }], 890 }],
889 ], 891 ],
890 } 892 }
OLDNEW
« no previous file with comments | « trunk/src/media/media.gyp ('k') | trunk/src/net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698