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

Side by Side Diff: trunk/src/content/content_shell.gypi

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/content/content_jni.gypi ('k') | trunk/src/content/content_tests.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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 'target_name': 'content_shell_jni_headers', 936 'target_name': 'content_shell_jni_headers',
937 'type': 'none', 937 'type': 'none',
938 'sources': [ 938 'sources': [
939 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java', 939 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java',
940 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java', 940 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java',
941 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ', 941 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ',
942 'shell/android/java/src/org/chromium/content_shell/Shell.java', 942 'shell/android/java/src/org/chromium/content_shell/Shell.java',
943 ], 943 ],
944 'variables': { 944 'variables': {
945 'jni_gen_package': 'content/shell', 945 'jni_gen_package': 'content/shell',
946 'jni_generator_ptr_type': 'long',
946 }, 947 },
947 'includes': [ '../build/jni_generator.gypi' ], 948 'includes': [ '../build/jni_generator.gypi' ],
948 }, 949 },
949 { 950 {
950 'target_name': 'libcontent_shell_content_view', 951 'target_name': 'libcontent_shell_content_view',
951 'type': 'shared_library', 952 'type': 'shared_library',
952 'dependencies': [ 953 'dependencies': [
953 'content_shell_jni_headers', 954 'content_shell_jni_headers',
954 'content_shell_lib', 955 'content_shell_lib',
955 'content_shell_pak', 956 'content_shell_pak',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1093 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1093 '--destination_dir', '<(dest_dir)', 1094 '--destination_dir', '<(dest_dir)',
1094 ], 1095 ],
1095 }, 1096 },
1096 ], 1097 ],
1097 }, 1098 },
1098 ], 1099 ],
1099 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1100 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1100 ] 1101 ]
1101 } 1102 }
OLDNEW
« no previous file with comments | « trunk/src/content/content_jni.gypi ('k') | trunk/src/content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698