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

Side by Side Diff: content/content_shell.gypi

Issue 133533002: Android: moves some content test targets to use long for JNI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « no previous file | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')
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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 'target_name': 'content_shell_jni_headers', 864 'target_name': 'content_shell_jni_headers',
865 'type': 'none', 865 'type': 'none',
866 'sources': [ 866 'sources': [
867 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java', 867 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java',
868 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java', 868 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java',
869 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ', 869 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ',
870 'shell/android/java/src/org/chromium/content_shell/Shell.java', 870 'shell/android/java/src/org/chromium/content_shell/Shell.java',
871 ], 871 ],
872 'variables': { 872 'variables': {
873 'jni_gen_package': 'content/shell', 873 'jni_gen_package': 'content/shell',
874 'jni_generator_ptr_type': 'long',
874 }, 875 },
875 'includes': [ '../build/jni_generator.gypi' ], 876 'includes': [ '../build/jni_generator.gypi' ],
876 }, 877 },
877 { 878 {
878 'target_name': 'libcontent_shell_content_view', 879 'target_name': 'libcontent_shell_content_view',
879 'type': 'shared_library', 880 'type': 'shared_library',
880 'dependencies': [ 881 'dependencies': [
881 'content_shell_jni_headers', 882 'content_shell_jni_headers',
882 'content_shell_lib', 883 'content_shell_lib',
883 'content_shell_pak', 884 'content_shell_pak',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1012 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1012 '--destination_dir', '<(dest_dir)', 1013 '--destination_dir', '<(dest_dir)',
1013 ], 1014 ],
1014 }, 1015 },
1015 ], 1016 ],
1016 }, 1017 },
1017 ], 1018 ],
1018 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1019 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1019 ] 1020 ]
1020 } 1021 }
OLDNEW
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698