| OLD | NEW | 
|---|
| 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 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2230 | 2230 | 
| 2231   # GYP: //base.gyp:base_java | 2231   # GYP: //base.gyp:base_java | 
| 2232   android_library("base_java") { | 2232   android_library("base_java") { | 
| 2233     srcjar_deps = [ | 2233     srcjar_deps = [ | 
| 2234       ":base_android_java_enums_srcjar", | 2234       ":base_android_java_enums_srcjar", | 
| 2235       ":base_build_config_gen", | 2235       ":base_build_config_gen", | 
| 2236       ":base_native_libraries_gen", | 2236       ":base_native_libraries_gen", | 
| 2237     ] | 2237     ] | 
| 2238 | 2238 | 
| 2239     deps = [ | 2239     deps = [ | 
|  | 2240       "//third_party/android_tools:android_support_annotations_java", | 
| 2240       "//third_party/android_tools:android_support_multidex_java", | 2241       "//third_party/android_tools:android_support_multidex_java", | 
| 2241       "//third_party/jsr-305:jsr_305_javalib", | 2242       "//third_party/jsr-305:jsr_305_javalib", | 
| 2242     ] | 2243     ] | 
| 2243 | 2244 | 
| 2244     java_files = [ | 2245     java_files = [ | 
| 2245       "android/java/src/org/chromium/base/ActivityState.java", | 2246       "android/java/src/org/chromium/base/ActivityState.java", | 
| 2246       "android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java", | 2247       "android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java", | 
| 2247       "android/java/src/org/chromium/base/ApiCompatibilityUtils.java", | 2248       "android/java/src/org/chromium/base/ApiCompatibilityUtils.java", | 
| 2248       "android/java/src/org/chromium/base/ApkAssets.java", | 2249       "android/java/src/org/chromium/base/ApkAssets.java", | 
| 2249       "android/java/src/org/chromium/base/ApplicationStatus.java", | 2250       "android/java/src/org/chromium/base/ApplicationStatus.java", | 
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2443 | 2444 | 
| 2444   # GYP: //base.gyp:base_java_unittest_support | 2445   # GYP: //base.gyp:base_java_unittest_support | 
| 2445   android_library("base_java_unittest_support") { | 2446   android_library("base_java_unittest_support") { | 
| 2446     deps = [ | 2447     deps = [ | 
| 2447       ":base_java", | 2448       ":base_java", | 
| 2448     ] | 2449     ] | 
| 2449     java_files = | 2450     java_files = | 
| 2450         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2451         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 
| 2451   } | 2452   } | 
| 2452 } | 2453 } | 
| OLD | NEW | 
|---|