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

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: 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
« no previous file with comments | « content/content_shell.gypi ('k') | media/media.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 (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 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 }, 984 },
985 { 985 {
986 'target_name': 'content_browsertests_apk', 986 'target_name': 'content_browsertests_apk',
987 'type': 'none', 987 'type': 'none',
988 'dependencies': [ 988 'dependencies': [
989 'content_browsertests', 989 'content_browsertests',
990 'content_java', 990 'content_java',
991 'content_shell_java', 991 'content_shell_java',
992 ], 992 ],
993 'variables': { 993 'variables': {
994 'package_name': 'content_browsertests_apk',
995 'apk_name': 'content_browsertests', 994 'apk_name': 'content_browsertests',
996 'java_in_dir': 'shell/android/browsertests_apk', 995 'java_in_dir': 'shell/android/browsertests_apk',
997 'resource_dir': 'res', 996 'resource_dir': 'res',
998 'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content _browsertests<(SHARED_LIB_SUFFIX)'], 997 'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content _browsertests<(SHARED_LIB_SUFFIX)'],
999 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 998 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1000 'asset_location': '<(ant_build_out)/content_shell/assets', 999 'asset_location': '<(ant_build_out)/content_shell/assets',
1001 }, 1000 },
1002 'includes': [ '../build/java_apk.gypi' ], 1001 'includes': [ '../build/java_apk.gypi' ],
1003 }, 1002 },
1004 ], 1003 ],
1005 }], 1004 }],
1006 ['OS == "android"', { 1005 ['OS == "android"', {
1007 'targets': [ 1006 'targets': [
1008 { 1007 {
1009 'target_name': 'content_java_test_support', 1008 'target_name': 'content_java_test_support',
1010 'type': 'none', 1009 'type': 'none',
1011 'dependencies': [ 1010 'dependencies': [
1012 '../base/base.gyp:base', 1011 '../base/base.gyp:base',
1013 '../base/base.gyp:base_java_test_support', 1012 '../base/base.gyp:base_java_test_support',
1014 'content_common', 1013 'content_common',
1015 'content_java', 1014 'content_java',
1016 ], 1015 ],
1017 'variables': { 1016 'variables': {
1018 'package_name': 'content_java_test_support',
1019 'java_in_dir': '../content/public/test/android/javatests', 1017 'java_in_dir': '../content/public/test/android/javatests',
1020 }, 1018 },
1021 'includes': [ '../build/java.gypi' ], 1019 'includes': [ '../build/java.gypi' ],
1022 }, 1020 },
1023 { 1021 {
1024 'target_name': 'content_shell_test_apk', 1022 'target_name': 'content_shell_test_apk',
1025 'type': 'none', 1023 'type': 'none',
1026 'dependencies': [ 1024 'dependencies': [
1027 'content_java', 1025 'content_java',
1028 'content_java_test_support', 1026 'content_java_test_support',
1029 'content_shell_apk_java', 1027 'content_shell_apk_java',
1030 '../base/base.gyp:base_java', 1028 '../base/base.gyp:base_java',
1031 '../base/base.gyp:base_java_test_support', 1029 '../base/base.gyp:base_java_test_support',
1032 '../media/media.gyp:media_java', 1030 '../media/media.gyp:media_java',
1033 '../media/media.gyp:media_test_support', 1031 '../media/media.gyp:media_test_support',
1034 '../net/net.gyp:net_java', 1032 '../net/net.gyp:net_java',
1035 '../net/net.gyp:net_javatests', 1033 '../net/net.gyp:net_javatests',
1036 '../tools/android/forwarder2/forwarder.gyp:forwarder2', 1034 '../tools/android/forwarder2/forwarder.gyp:forwarder2',
1037 ], 1035 ],
1038 'variables': { 1036 'variables': {
1039 'package_name': 'content_shell_test',
1040 'apk_name': 'ContentShellTest', 1037 'apk_name': 'ContentShellTest',
1041 'java_in_dir': '../content/shell/android/javatests', 1038 'java_in_dir': '../content/shell/android/javatests',
1042 'additional_src_dirs': ['../content/public/android/javatests/',], 1039 'additional_src_dirs': ['../content/public/android/javatests/',],
1043 'resource_dir': '../shell_apk/res', 1040 'resource_dir': '../shell_apk/res',
1044 'is_test_apk': 1, 1041 'is_test_apk': 1,
1045 }, 1042 },
1046 'includes': [ '../build/java_apk.gypi' ], 1043 'includes': [ '../build/java_apk.gypi' ],
1047 }, 1044 },
1048 ], 1045 ],
1049 }], 1046 }],
1050 ], 1047 ],
1051 } 1048 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698