Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 430 ], | 430 ], |
| 431 'sources': [ | 431 'sources': [ |
| 432 'test/run_all_unittests.cc', | 432 'test/run_all_unittests.cc', |
| 433 ], | 433 ], |
| 434 }, | 434 }, |
| 435 { | 435 { |
| 436 'target_name': 'base_unittests', | 436 'target_name': 'base_unittests', |
| 437 'type': '<(gtest_target_type)', | 437 'type': '<(gtest_target_type)', |
| 438 'sources': [ | 438 'sources': [ |
| 439 # Tests. | 439 # Tests. |
| 440 'android/activity_status_unittest.cc', | |
| 440 'android/jni_android_unittest.cc', | 441 'android/jni_android_unittest.cc', |
| 441 'android/jni_array_unittest.cc', | 442 'android/jni_array_unittest.cc', |
| 442 'android/jni_string_unittest.cc', | 443 'android/jni_string_unittest.cc', |
| 443 'android/path_utils_unittest.cc', | 444 'android/path_utils_unittest.cc', |
| 444 'android/scoped_java_ref_unittest.cc', | 445 'android/scoped_java_ref_unittest.cc', |
| 445 'at_exit_unittest.cc', | 446 'at_exit_unittest.cc', |
| 446 'atomicops_unittest.cc', | 447 'atomicops_unittest.cc', |
| 447 'base64_unittest.cc', | 448 'base64_unittest.cc', |
| 448 'bind_helpers_unittest.cc', | 449 'bind_helpers_unittest.cc', |
| 449 'bind_unittest.cc', | 450 'bind_unittest.cc', |
| (...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1112 ], | 1113 ], |
| 1113 }, | 1114 }, |
| 1114 ], | 1115 ], |
| 1115 }], | 1116 }], |
| 1116 ['OS == "android"', { | 1117 ['OS == "android"', { |
| 1117 'targets': [ | 1118 'targets': [ |
| 1118 { | 1119 { |
| 1119 'target_name': 'base_jni_headers', | 1120 'target_name': 'base_jni_headers', |
| 1120 'type': 'none', | 1121 'type': 'none', |
| 1121 'sources': [ | 1122 'sources': [ |
| 1123 'android/java/src/org/chromium/base/ActivityStatus.java', | |
| 1122 'android/java/src/org/chromium/base/BuildInfo.java', | 1124 'android/java/src/org/chromium/base/BuildInfo.java', |
| 1123 'android/java/src/org/chromium/base/CpuFeatures.java', | 1125 'android/java/src/org/chromium/base/CpuFeatures.java', |
| 1124 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' , | 1126 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' , |
| 1125 'android/java/src/org/chromium/base/PathService.java', | 1127 'android/java/src/org/chromium/base/PathService.java', |
| 1126 'android/java/src/org/chromium/base/PathUtils.java', | 1128 'android/java/src/org/chromium/base/PathUtils.java', |
| 1127 'android/java/src/org/chromium/base/PowerMonitor.java', | 1129 'android/java/src/org/chromium/base/PowerMonitor.java', |
| 1128 'android/java/src/org/chromium/base/SystemMessageHandler.java', | 1130 'android/java/src/org/chromium/base/SystemMessageHandler.java', |
| 1129 'android/java/src/org/chromium/base/ThreadUtils.java', | 1131 'android/java/src/org/chromium/base/ThreadUtils.java', |
| 1130 ], | 1132 ], |
| 1131 'variables': { | 1133 'variables': { |
| 1132 'jni_gen_package': 'base', | 1134 'jni_gen_package': 'base', |
| 1133 }, | 1135 }, |
| 1134 'includes': [ '../build/jni_generator.gypi' ], | 1136 'includes': [ '../build/jni_generator.gypi' ], |
| 1135 }, | 1137 }, |
| 1136 { | 1138 { |
| 1137 'target_name': 'base_java', | 1139 'target_name': 'base_java', |
| 1138 'type': 'none', | 1140 'type': 'none', |
| 1139 'variables': { | 1141 'variables': { |
| 1140 'java_in_dir': '../base/android/java', | 1142 'java_in_dir': '../base/android/java', |
| 1141 }, | 1143 }, |
| 1144 'dependencies': [ | |
| 1145 'base_java_activity_state', | |
| 1146 ], | |
| 1142 'includes': [ '../build/java.gypi' ], | 1147 'includes': [ '../build/java.gypi' ], |
| 1143 'conditions': [ | 1148 'conditions': [ |
| 1144 ['android_webview_build==0', { | 1149 ['android_webview_build==0', { |
| 1145 'dependencies': [ | 1150 'dependencies': [ |
| 1146 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', | 1151 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', |
| 1147 ], | 1152 ], |
| 1148 }] | 1153 }] |
| 1149 ], | 1154 ], |
| 1150 }, | 1155 }, |
| 1151 { | 1156 { |
| 1157 'target_name': 'base_java_activity_state', | |
|
brettw
2013/04/27 05:16:41
This adds a new target. It isn't clear from the co
digit1
2013/04/29 12:22:10
Thanks for the suggestion, I've added a comment to
| |
| 1158 'type': 'none', | |
| 1159 'sources': [ | |
| 1160 'android/java/src/org/chromium/base/ActivityState.template', | |
| 1161 ], | |
| 1162 'variables': { | |
| 1163 'package_name': 'org/chromium/base', | |
| 1164 'template_deps': ['android/activity_state_list.h'], | |
| 1165 }, | |
| 1166 'includes': [ '../build/android/java_cpp_template.gypi' ], | |
| 1167 }, | |
| 1168 { | |
| 1152 'target_name': 'base_java_test_support', | 1169 'target_name': 'base_java_test_support', |
| 1153 'type': 'none', | 1170 'type': 'none', |
| 1154 'dependencies': [ | 1171 'dependencies': [ |
| 1155 'base_java', | 1172 'base_java', |
| 1156 ], | 1173 ], |
| 1157 'variables': { | 1174 'variables': { |
| 1158 'java_in_dir': '../base/test/android/javatests', | 1175 'java_in_dir': '../base/test/android/javatests', |
| 1159 }, | 1176 }, |
| 1160 'includes': [ '../build/java.gypi' ], | 1177 'includes': [ '../build/java.gypi' ], |
| 1161 }, | 1178 }, |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1225 'base_unittests.isolate', | 1242 'base_unittests.isolate', |
| 1226 ], | 1243 ], |
| 1227 'sources': [ | 1244 'sources': [ |
| 1228 'base_unittests.isolate', | 1245 'base_unittests.isolate', |
| 1229 ], | 1246 ], |
| 1230 }, | 1247 }, |
| 1231 ], | 1248 ], |
| 1232 }], | 1249 }], |
| 1233 ], | 1250 ], |
| 1234 } | 1251 } |
| OLD | NEW |