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

Side by Side Diff: base/BUILD.gn

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test-only subclasses for JavaHandlerThread and SystemMessageHandler. Created 4 years, 4 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # HOW TO WRITE CONDITIONALS IN THIS FILE 5 # HOW TO WRITE CONDITIONALS IN THIS FILE
6 # ====================================== 6 # ======================================
7 # 7 #
8 # In many other places, one would write a conditional that expresses all the 8 # In many other places, one would write a conditional that expresses all the
9 # cases when a source file is used or unused, and then either add or subtract 9 # cases when a source file is used or unused, and then either add or subtract
10 # it from the sources list in that case 10 # it from the sources list in that case
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 "message_loop/message_pump_glib.cc", 507 "message_loop/message_pump_glib.cc",
508 "message_loop/message_pump_glib.h", 508 "message_loop/message_pump_glib.h",
509 "message_loop/message_pump_io_ios.cc", 509 "message_loop/message_pump_io_ios.cc",
510 "message_loop/message_pump_io_ios.h", 510 "message_loop/message_pump_io_ios.h",
511 "message_loop/message_pump_libevent.cc", 511 "message_loop/message_pump_libevent.cc",
512 "message_loop/message_pump_libevent.h", 512 "message_loop/message_pump_libevent.h",
513 "message_loop/message_pump_mac.h", 513 "message_loop/message_pump_mac.h",
514 "message_loop/message_pump_mac.mm", 514 "message_loop/message_pump_mac.mm",
515 "message_loop/message_pump_win.cc", 515 "message_loop/message_pump_win.cc",
516 "message_loop/message_pump_win.h", 516 "message_loop/message_pump_win.h",
517 "message_loop/test_system_message_handler_link_android.cc",
518 "message_loop/test_system_message_handler_link_android.h",
517 "metrics/bucket_ranges.cc", 519 "metrics/bucket_ranges.cc",
518 "metrics/bucket_ranges.h", 520 "metrics/bucket_ranges.h",
519 "metrics/field_trial.cc", 521 "metrics/field_trial.cc",
520 "metrics/field_trial.h", 522 "metrics/field_trial.h",
521 "metrics/histogram.cc", 523 "metrics/histogram.cc",
522 "metrics/histogram.h", 524 "metrics/histogram.h",
523 "metrics/histogram_base.cc", 525 "metrics/histogram_base.cc",
524 "metrics/histogram_base.h", 526 "metrics/histogram_base.h",
525 "metrics/histogram_delta_serialization.cc", 527 "metrics/histogram_delta_serialization.cc",
526 "metrics/histogram_delta_serialization.h", 528 "metrics/histogram_delta_serialization.h",
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
2018 # Allow more direct string conversions on platforms with native utf8 2020 # Allow more direct string conversions on platforms with native utf8
2019 # strings 2021 # strings
2020 if (is_mac || is_ios || is_chromeos || is_chromecast) { 2022 if (is_mac || is_ios || is_chromeos || is_chromecast) {
2021 defines += [ "SYSTEM_NATIVE_UTF8" ] 2023 defines += [ "SYSTEM_NATIVE_UTF8" ]
2022 } 2024 }
2023 2025
2024 if (is_android) { 2026 if (is_android) {
2025 deps += [ 2027 deps += [
2026 ":base_java", 2028 ":base_java",
2027 ":base_java_unittest_support", 2029 ":base_java_unittest_support",
2030 ":base_native_unittest_support",
2028 "//base/android/jni_generator:jni_generator_tests", 2031 "//base/android/jni_generator:jni_generator_tests",
2029 ] 2032 ]
2030 } 2033 }
2031 2034
2032 if (is_ios) { 2035 if (is_ios) {
2033 sources -= [ 2036 sources -= [
2034 "files/file_locking_unittest.cc", 2037 "files/file_locking_unittest.cc",
2035 "files/file_path_watcher_unittest.cc", 2038 "files/file_path_watcher_unittest.cc",
2036 "memory/discardable_shared_memory_unittest.cc", 2039 "memory/discardable_shared_memory_unittest.cc",
2037 "memory/shared_memory_unittest.cc", 2040 "memory/shared_memory_unittest.cc",
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", 2194 "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
2192 "android/java/src/org/chromium/base/JNIUtils.java", 2195 "android/java/src/org/chromium/base/JNIUtils.java",
2193 "android/java/src/org/chromium/base/JavaHandlerThread.java", 2196 "android/java/src/org/chromium/base/JavaHandlerThread.java",
2194 "android/java/src/org/chromium/base/LocaleUtils.java", 2197 "android/java/src/org/chromium/base/LocaleUtils.java",
2195 "android/java/src/org/chromium/base/MemoryPressureListener.java", 2198 "android/java/src/org/chromium/base/MemoryPressureListener.java",
2196 "android/java/src/org/chromium/base/PathService.java", 2199 "android/java/src/org/chromium/base/PathService.java",
2197 "android/java/src/org/chromium/base/PathUtils.java", 2200 "android/java/src/org/chromium/base/PathUtils.java",
2198 "android/java/src/org/chromium/base/PowerMonitor.java", 2201 "android/java/src/org/chromium/base/PowerMonitor.java",
2199 "android/java/src/org/chromium/base/SysUtils.java", 2202 "android/java/src/org/chromium/base/SysUtils.java",
2200 "android/java/src/org/chromium/base/SystemMessageHandler.java", 2203 "android/java/src/org/chromium/base/SystemMessageHandler.java",
2204 "android/java/src/org/chromium/base/TestSystemMessageHandler.java",
2201 "android/java/src/org/chromium/base/ThreadUtils.java", 2205 "android/java/src/org/chromium/base/ThreadUtils.java",
2202 "android/java/src/org/chromium/base/TraceEvent.java", 2206 "android/java/src/org/chromium/base/TraceEvent.java",
2203 "android/java/src/org/chromium/base/library_loader/LibraryLoader.java", 2207 "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
2204 "android/java/src/org/chromium/base/metrics/RecordHistogram.java", 2208 "android/java/src/org/chromium/base/metrics/RecordHistogram.java",
2205 "android/java/src/org/chromium/base/metrics/RecordUserAction.java", 2209 "android/java/src/org/chromium/base/metrics/RecordUserAction.java",
2206 ] 2210 ]
2207 2211
2208 public_deps = [ 2212 public_deps = [
2209 ":android_runtime_jni_headers", 2213 ":android_runtime_jni_headers",
2210 ] 2214 ]
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
2263 "android/java/src/org/chromium/base/PathUtils.java", 2267 "android/java/src/org/chromium/base/PathUtils.java",
2264 "android/java/src/org/chromium/base/PerfTraceEvent.java", 2268 "android/java/src/org/chromium/base/PerfTraceEvent.java",
2265 "android/java/src/org/chromium/base/PowerMonitor.java", 2269 "android/java/src/org/chromium/base/PowerMonitor.java",
2266 "android/java/src/org/chromium/base/PowerStatusReceiver.java", 2270 "android/java/src/org/chromium/base/PowerStatusReceiver.java",
2267 "android/java/src/org/chromium/base/Promise.java", 2271 "android/java/src/org/chromium/base/Promise.java",
2268 "android/java/src/org/chromium/base/ResourceExtractor.java", 2272 "android/java/src/org/chromium/base/ResourceExtractor.java",
2269 "android/java/src/org/chromium/base/SecureRandomInitializer.java", 2273 "android/java/src/org/chromium/base/SecureRandomInitializer.java",
2270 "android/java/src/org/chromium/base/StreamUtil.java", 2274 "android/java/src/org/chromium/base/StreamUtil.java",
2271 "android/java/src/org/chromium/base/SysUtils.java", 2275 "android/java/src/org/chromium/base/SysUtils.java",
2272 "android/java/src/org/chromium/base/SystemMessageHandler.java", 2276 "android/java/src/org/chromium/base/SystemMessageHandler.java",
2277 "android/java/src/org/chromium/base/TestSystemMessageHandler.java",
2273 "android/java/src/org/chromium/base/ThreadUtils.java", 2278 "android/java/src/org/chromium/base/ThreadUtils.java",
2274 "android/java/src/org/chromium/base/TraceEvent.java", 2279 "android/java/src/org/chromium/base/TraceEvent.java",
2275 "android/java/src/org/chromium/base/VisibleForTesting.java", 2280 "android/java/src/org/chromium/base/VisibleForTesting.java",
2276 "android/java/src/org/chromium/base/annotations/AccessedByNative.java", 2281 "android/java/src/org/chromium/base/annotations/AccessedByNative.java",
2277 "android/java/src/org/chromium/base/annotations/CalledByNative.java", 2282 "android/java/src/org/chromium/base/annotations/CalledByNative.java",
2278 "android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.ja va", 2283 "android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.ja va",
2279 "android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java", 2284 "android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
2280 "android/java/src/org/chromium/base/annotations/JNINamespace.java", 2285 "android/java/src/org/chromium/base/annotations/JNINamespace.java",
2281 "android/java/src/org/chromium/base/annotations/MainDex.java", 2286 "android/java/src/org/chromium/base/annotations/MainDex.java",
2282 "android/java/src/org/chromium/base/annotations/NativeCall.java", 2287 "android/java/src/org/chromium/base/annotations/NativeCall.java",
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
2432 } 2437 }
2433 2438
2434 # GYP: //base.gyp:base_java_unittest_support 2439 # GYP: //base.gyp:base_java_unittest_support
2435 android_library("base_java_unittest_support") { 2440 android_library("base_java_unittest_support") {
2436 deps = [ 2441 deps = [
2437 ":base_java", 2442 ":base_java",
2438 ] 2443 ]
2439 java_files = 2444 java_files =
2440 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 2445 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
2441 } 2446 }
2447
2448 component("base_native_unittest_support") {
nyquist 2016/08/16 17:46:39 Did you mean for this to be a source_set?
gsennton 2016/08/17 17:05:47 yeah, I've removed this completely and put the fil
2449 sources = [
2450 "android/java_handler_thread_for_testing.cc",
2451 "android/java_handler_thread_for_testing.h",
2452 ]
2453
2454 deps = [
2455 ":base",
2456 ]
2457 }
2442 } 2458 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698