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

Side by Side Diff: base/base.gyp

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 | « android_webview/android_webview_tests.gypi ('k') | build/android/ant/chromium-apk.xml » ('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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 ], 1106 ],
1107 'variables': { 1107 'variables': {
1108 'jni_gen_dir': 'base', 1108 'jni_gen_dir': 'base',
1109 }, 1109 },
1110 'includes': [ '../build/jni_generator.gypi' ], 1110 'includes': [ '../build/jni_generator.gypi' ],
1111 }, 1111 },
1112 { 1112 {
1113 'target_name': 'base_java', 1113 'target_name': 'base_java',
1114 'type': 'none', 1114 'type': 'none',
1115 'variables': { 1115 'variables': {
1116 'package_name': 'base',
1117 'java_in_dir': '../base/android/java', 1116 'java_in_dir': '../base/android/java',
1118 }, 1117 },
1119 'includes': [ '../build/java.gypi' ], 1118 'includes': [ '../build/java.gypi' ],
1120 }, 1119 },
1121 { 1120 {
1122 'target_name': 'base_java_test_support', 1121 'target_name': 'base_java_test_support',
1123 'type': 'none', 1122 'type': 'none',
1124 'dependencies': [ 1123 'dependencies': [
1125 'base_java', 1124 'base_java',
1126 ], 1125 ],
1127 'variables': { 1126 'variables': {
1128 'package_name': 'base_javatests',
1129 'java_in_dir': '../base/test/android/javatests', 1127 'java_in_dir': '../base/test/android/javatests',
1130 }, 1128 },
1131 'includes': [ '../build/java.gypi' ], 1129 'includes': [ '../build/java.gypi' ],
1132 }, 1130 },
1133 ], 1131 ],
1134 }], 1132 }],
1135 ['OS == "win"', { 1133 ['OS == "win"', {
1136 'targets': [ 1134 'targets': [
1137 { 1135 {
1138 'target_name': 'debug_message', 1136 'target_name': 'debug_message',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 'base_unittests.isolate', 1182 'base_unittests.isolate',
1185 ], 1183 ],
1186 'sources': [ 1184 'sources': [
1187 'base_unittests.isolate', 1185 'base_unittests.isolate',
1188 ], 1186 ],
1189 }, 1187 },
1190 ], 1188 ],
1191 }], 1189 }],
1192 ], 1190 ],
1193 } 1191 }
OLDNEW
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | build/android/ant/chromium-apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698