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

Side by Side Diff: base/base.gyp

Issue 75533002: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
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 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 'sources!': [ 889 'sources!': [
890 'test/scoped_locale.cc', 890 'test/scoped_locale.cc',
891 'test/scoped_locale.h', 891 'test/scoped_locale.h',
892 ], 892 ],
893 }], 893 }],
894 ['os_bsd==1', { 894 ['os_bsd==1', {
895 'sources!': [ 895 'sources!': [
896 'test/test_file_util_linux.cc', 896 'test/test_file_util_linux.cc',
897 ], 897 ],
898 }], 898 }],
899 ['OS == "android"', {
900 'dependencies': [
901 'base_unittests_jni_headers',
902 'base_java_unittest_support',
903 ],
904 'include_dirs': [
905 '<(SHARED_INTERMEDIATE_DIR)/base',
906 ],
907 }],
899 ], 908 ],
900 'sources': [ 909 'sources': [
901 'test/expectations/expectation.cc', 910 'test/expectations/expectation.cc',
902 'test/expectations/expectation.h', 911 'test/expectations/expectation.h',
903 'test/expectations/parser.cc', 912 'test/expectations/parser.cc',
904 'test/expectations/parser.h', 913 'test/expectations/parser.h',
905 'test/gtest_xml_util.cc', 914 'test/gtest_xml_util.cc',
906 'test/gtest_xml_util.h', 915 'test/gtest_xml_util.h',
907 'test/launcher/test_launcher.cc', 916 'test/launcher/test_launcher.cc',
908 'test/launcher/test_launcher.h', 917 'test/launcher/test_launcher.h',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 'test/sequenced_worker_pool_owner.cc', 950 'test/sequenced_worker_pool_owner.cc',
942 'test/sequenced_worker_pool_owner.h', 951 'test/sequenced_worker_pool_owner.h',
943 'test/simple_test_clock.cc', 952 'test/simple_test_clock.cc',
944 'test/simple_test_clock.h', 953 'test/simple_test_clock.h',
945 'test/simple_test_tick_clock.cc', 954 'test/simple_test_tick_clock.cc',
946 'test/simple_test_tick_clock.h', 955 'test/simple_test_tick_clock.h',
947 'test/task_runner_test_template.cc', 956 'test/task_runner_test_template.cc',
948 'test/task_runner_test_template.h', 957 'test/task_runner_test_template.h',
949 'test/test_file_util.cc', 958 'test/test_file_util.cc',
950 'test/test_file_util.h', 959 'test/test_file_util.h',
960 'test/test_file_util_android.cc',
951 'test/test_file_util_linux.cc', 961 'test/test_file_util_linux.cc',
952 'test/test_file_util_mac.cc', 962 'test/test_file_util_mac.cc',
953 'test/test_file_util_posix.cc', 963 'test/test_file_util_posix.cc',
954 'test/test_file_util_win.cc', 964 'test/test_file_util_win.cc',
955 'test/test_listener_ios.h', 965 'test/test_listener_ios.h',
956 'test/test_listener_ios.mm', 966 'test/test_listener_ios.mm',
957 'test/test_pending_task.cc', 967 'test/test_pending_task.cc',
958 'test/test_pending_task.h', 968 'test/test_pending_task.h',
959 'test/test_process_killer_win.cc', 969 'test/test_process_killer_win.cc',
960 'test/test_process_killer_win.h', 970 'test/test_process_killer_win.h',
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 }], 1218 }],
1209 ['OS == "android"', { 1219 ['OS == "android"', {
1210 'targets': [ 1220 'targets': [
1211 { 1221 {
1212 'target_name': 'base_jni_headers', 1222 'target_name': 'base_jni_headers',
1213 'type': 'none', 1223 'type': 'none',
1214 'sources': [ 1224 'sources': [
1215 'android/java/src/org/chromium/base/ActivityStatus.java', 1225 'android/java/src/org/chromium/base/ActivityStatus.java',
1216 'android/java/src/org/chromium/base/BuildInfo.java', 1226 'android/java/src/org/chromium/base/BuildInfo.java',
1217 'android/java/src/org/chromium/base/CommandLine.java', 1227 'android/java/src/org/chromium/base/CommandLine.java',
1228 'android/java/src/org/chromium/base/ContentUriUtils.java',
1218 'android/java/src/org/chromium/base/CpuFeatures.java', 1229 'android/java/src/org/chromium/base/CpuFeatures.java',
1219 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' , 1230 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' ,
1220 'android/java/src/org/chromium/base/MemoryPressureListener.java', 1231 'android/java/src/org/chromium/base/MemoryPressureListener.java',
1221 'android/java/src/org/chromium/base/JavaHandlerThread.java', 1232 'android/java/src/org/chromium/base/JavaHandlerThread.java',
1222 'android/java/src/org/chromium/base/PathService.java', 1233 'android/java/src/org/chromium/base/PathService.java',
1223 'android/java/src/org/chromium/base/PathUtils.java', 1234 'android/java/src/org/chromium/base/PathUtils.java',
1224 'android/java/src/org/chromium/base/PowerMonitor.java', 1235 'android/java/src/org/chromium/base/PowerMonitor.java',
1225 'android/java/src/org/chromium/base/SystemMessageHandler.java', 1236 'android/java/src/org/chromium/base/SystemMessageHandler.java',
1226 'android/java/src/org/chromium/base/SysUtils.java', 1237 'android/java/src/org/chromium/base/SysUtils.java',
1227 'android/java/src/org/chromium/base/ThreadUtils.java', 1238 'android/java/src/org/chromium/base/ThreadUtils.java',
1228 ], 1239 ],
1229 'conditions': [ 1240 'conditions': [
1230 ['google_tv==1', { 1241 ['google_tv==1', {
1231 'sources': [ 1242 'sources': [
1232 'android/java/src/org/chromium/base/ContextTypes.java', 1243 'android/java/src/org/chromium/base/ContextTypes.java',
1233 ], 1244 ],
1234 }], 1245 }],
1235 ], 1246 ],
1236 'variables': { 1247 'variables': {
1237 'jni_gen_package': 'base', 1248 'jni_gen_package': 'base',
1238 'jni_generator_ptr_type': 'long', 1249 'jni_generator_ptr_type': 'long',
1239 }, 1250 },
1240 'includes': [ '../build/jni_generator.gypi' ], 1251 'includes': [ '../build/jni_generator.gypi' ],
1241 }, 1252 },
1242 { 1253 {
1254 'target_name': 'base_unittests_jni_headers',
1255 'type': 'none',
1256 'sources': [
1257 'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
1258 ],
1259 'variables': {
1260 'jni_gen_package': 'base',
1261 },
1262 'includes': [ '../build/jni_generator.gypi' ],
1263 },
1264 {
1243 'target_name': 'base_java', 1265 'target_name': 'base_java',
1244 'type': 'none', 1266 'type': 'none',
1245 'variables': { 1267 'variables': {
1246 'java_in_dir': '../base/android/java', 1268 'java_in_dir': '../base/android/java',
1247 }, 1269 },
1248 'dependencies': [ 1270 'dependencies': [
1249 'base_java_activity_state', 1271 'base_java_activity_state',
1250 'base_java_memory_pressure_level_list', 1272 'base_java_memory_pressure_level_list',
1251 ], 1273 ],
1252 'includes': [ '../build/java.gypi' ], 1274 'includes': [ '../build/java.gypi' ],
1253 'conditions': [ 1275 'conditions': [
1254 ['android_webview_build==0', { 1276 ['android_webview_build==0', {
1255 'dependencies': [ 1277 'dependencies': [
1256 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1278 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1257 ], 1279 ],
1258 }] 1280 }]
1259 ], 1281 ],
1260 }, 1282 },
1261 { 1283 {
1284 'target_name': 'base_java_unittest_support',
1285 'type': 'none',
1286 'dependencies': [
1287 'base_java',
1288 ],
1289 'variables': {
1290 'java_in_dir': '../base/test/android/java',
1291 },
1292 'includes': [ '../build/java.gypi' ],
1293 },
1294 {
1262 'target_name': 'base_java_activity_state', 1295 'target_name': 'base_java_activity_state',
1263 'type': 'none', 1296 'type': 'none',
1264 # This target is used to auto-generate ActivityState.java 1297 # This target is used to auto-generate ActivityState.java
1265 # from a template file. The source file contains a list of 1298 # from a template file. The source file contains a list of
1266 # Java constant declarations matching the ones in 1299 # Java constant declarations matching the ones in
1267 # android/activity_state_list.h. 1300 # android/activity_state_list.h.
1268 'sources': [ 1301 'sources': [
1269 'android/java/src/org/chromium/base/ActivityState.template', 1302 'android/java/src/org/chromium/base/ActivityState.template',
1270 ], 1303 ],
1271 'variables': { 1304 'variables': {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1363 'base_unittests.isolate', 1396 'base_unittests.isolate',
1364 ], 1397 ],
1365 'sources': [ 1398 'sources': [
1366 'base_unittests.isolate', 1399 'base_unittests.isolate',
1367 ], 1400 ],
1368 }, 1401 },
1369 ], 1402 ],
1370 }], 1403 }],
1371 ], 1404 ],
1372 } 1405 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698