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

Side by Side Diff: content/content_tests.gypi

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: And fix android_webview_test_apk Created 7 years, 10 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
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 }, 981 },
982 { 982 {
983 'target_name': 'content_browsertests_apk', 983 'target_name': 'content_browsertests_apk',
984 'type': 'none', 984 'type': 'none',
985 'dependencies': [ 985 'dependencies': [
986 'content_browsertests', 986 'content_browsertests',
987 'content_java', 987 'content_java',
988 'content_shell_java', 988 'content_shell_java',
989 ], 989 ],
990 'variables': { 990 'variables': {
991 'package_name': 'content_browsertests_apk',
992 'apk_name': 'content_browsertests', 991 'apk_name': 'content_browsertests',
993 'java_in_dir': 'shell/android/browsertests_apk', 992 'java_in_dir': 'shell/android/browsertests_apk',
994 'resource_dir': 'res', 993 'resource_dir': 'res',
995 'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content _browsertests<(SHARED_LIB_SUFFIX)'], 994 'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content _browsertests<(SHARED_LIB_SUFFIX)'],
996 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 995 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
997 'asset_location': '<(ant_build_out)/content_shell/assets', 996 'asset_location': '<(ant_build_out)/content_shell/assets',
998 }, 997 },
999 'includes': [ '../build/java_apk.gypi' ], 998 'includes': [ '../build/java_apk.gypi' ],
1000 }, 999 },
1001 ], 1000 ],
1002 }], 1001 }],
1003 ['OS == "android"', { 1002 ['OS == "android"', {
1004 'targets': [ 1003 'targets': [
1005 { 1004 {
1006 'target_name': 'content_java_test_support', 1005 'target_name': 'content_java_test_support',
1007 'type': 'none', 1006 'type': 'none',
1008 'dependencies': [ 1007 'dependencies': [
1009 '../base/base.gyp:base', 1008 '../base/base.gyp:base',
1010 '../base/base.gyp:base_java_test_support', 1009 '../base/base.gyp:base_java_test_support',
1011 'content_common', 1010 'content_common',
1012 'content_java', 1011 'content_java',
1013 ], 1012 ],
1014 'variables': { 1013 'variables': {
1015 'package_name': 'content_java_test_support',
1016 'java_in_dir': '../content/public/test/android/javatests', 1014 'java_in_dir': '../content/public/test/android/javatests',
1017 }, 1015 },
1018 'includes': [ '../build/java.gypi' ], 1016 'includes': [ '../build/java.gypi' ],
1019 }, 1017 },
1020 { 1018 {
1021 'target_name': 'content_shell_test_apk', 1019 'target_name': 'content_shell_test_apk',
1022 'type': 'none', 1020 'type': 'none',
1023 'dependencies': [ 1021 'dependencies': [
1024 'content_java', 1022 'content_java',
1025 'content_java_test_support', 1023 'content_java_test_support',
1026 'content_shell_apk_java', 1024 'content_shell_apk_java',
1027 '../base/base.gyp:base_java', 1025 '../base/base.gyp:base_java',
1028 '../base/base.gyp:base_java_test_support', 1026 '../base/base.gyp:base_java_test_support',
1029 '../media/media.gyp:media_java', 1027 '../media/media.gyp:media_java',
1030 '../media/media.gyp:media_test_support', 1028 '../media/media.gyp:media_test_support',
1031 '../net/net.gyp:net_java', 1029 '../net/net.gyp:net_java',
1032 '../net/net.gyp:net_javatests', 1030 '../net/net.gyp:net_javatests',
1033 '../tools/android/forwarder2/forwarder.gyp:forwarder2', 1031 '../tools/android/forwarder2/forwarder.gyp:forwarder2',
1034 ], 1032 ],
1035 'variables': { 1033 'variables': {
1036 'package_name': 'content_shell_test',
1037 'apk_name': 'ContentShellTest', 1034 'apk_name': 'ContentShellTest',
1038 'java_in_dir': '../content/shell/android/javatests', 1035 'java_in_dir': '../content/shell/android/javatests',
1039 'additional_src_dirs': ['../content/public/android/javatests/',], 1036 'additional_src_dirs': ['../content/public/android/javatests/',],
1040 'resource_dir': '../shell_apk/res', 1037 'resource_dir': '../shell_apk/res',
1041 'is_test_apk': 1, 1038 'is_test_apk': 1,
1042 }, 1039 },
1043 'includes': [ '../build/java_apk.gypi' ], 1040 'includes': [ '../build/java_apk.gypi' ],
1044 }, 1041 },
1045 ], 1042 ],
1046 }], 1043 }],
1047 ], 1044 ],
1048 } 1045 }
OLDNEW
« build/java.gypi ('K') | « content/content_shell.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698