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

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 8 years, 1 month 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 '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 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 ], 1016 ],
1017 'variables': { 1017 'variables': {
1018 'jni_gen_dir': 'base', 1018 'jni_gen_dir': 'base',
1019 }, 1019 },
1020 'includes': [ '../build/jni_generator.gypi' ], 1020 'includes': [ '../build/jni_generator.gypi' ],
1021 }, 1021 },
1022 { 1022 {
1023 'target_name': 'base_java', 1023 'target_name': 'base_java',
1024 'type': 'none', 1024 'type': 'none',
1025 'variables': { 1025 'variables': {
1026 'package_name': 'base',
1027 'java_in_dir': '../base/android/java', 1026 'java_in_dir': '../base/android/java',
1028 }, 1027 },
1029 'includes': [ '../build/java.gypi' ], 1028 'includes': [ '../build/java.gypi' ],
1030 }, 1029 },
1031 { 1030 {
1032 'target_name': 'base_java_test_support', 1031 'target_name': 'base_java_test_support',
1033 'type': 'none', 1032 'type': 'none',
1034 'dependencies': [ 1033 'dependencies': [
1035 'base_java', 1034 'base_java',
1036 ], 1035 ],
1037 'variables': { 1036 'variables': {
1038 'package_name': 'base_javatests',
1039 'java_in_dir': '../base/test/android/javatests', 1037 'java_in_dir': '../base/test/android/javatests',
1040 }, 1038 },
1041 'includes': [ '../build/java.gypi' ], 1039 'includes': [ '../build/java.gypi' ],
1042 }, 1040 },
1043 ], 1041 ],
1044 }], 1042 }],
1045 ['OS == "win"', { 1043 ['OS == "win"', {
1046 'targets': [ 1044 'targets': [
1047 { 1045 {
1048 'target_name': 'debug_message', 1046 'target_name': 'debug_message',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 'base_unittests.isolate', 1092 'base_unittests.isolate',
1095 ], 1093 ],
1096 'sources': [ 1094 'sources': [
1097 'base_unittests.isolate', 1095 'base_unittests.isolate',
1098 ], 1096 ],
1099 }, 1097 },
1100 ], 1098 ],
1101 }], 1099 }],
1102 ], 1100 ],
1103 } 1101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698