| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/android/rules.gni") | 5 import("//build/config/android/rules.gni") |
| 6 | 6 |
| 7 config("cpu_features_include") { | 7 config("cpu_features_include") { |
| 8 include_dirs = [ "$android_ndk_root/sources/android/cpufeatures" ] | 8 include_dirs = [ "$android_ndk_root/sources/android/cpufeatures" ] |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 configs -= [ "//build/config/compiler:chromium_code" ] | 24 configs -= [ "//build/config/compiler:chromium_code" ] |
| 25 configs += [ | 25 configs += [ |
| 26 "//build/config/compiler:no_chromium_code", | 26 "//build/config/compiler:no_chromium_code", |
| 27 | 27 |
| 28 # Must be after no_chromium_code for warning flags to be ordered correctly. | 28 # Must be after no_chromium_code for warning flags to be ordered correctly. |
| 29 ":cpu_features_warnings", | 29 ":cpu_features_warnings", |
| 30 ] | 30 ] |
| 31 } | 31 } |
| 32 | 32 |
| 33 lib_version = "25.0.1" | 33 lib_version = "25.1.0" |
| 34 lib_path = "$android_sdk_root/extras/android/m2repository/com/android/support" | 34 lib_path = "$android_sdk_root/extras/android/m2repository/com/android/support" |
| 35 | 35 |
| 36 android_java_prebuilt("android_gcm_java") { | 36 android_java_prebuilt("android_gcm_java") { |
| 37 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" | 37 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" |
| 38 } | 38 } |
| 39 | 39 |
| 40 android_java_prebuilt("emma_device_java") { | 40 android_java_prebuilt("emma_device_java") { |
| 41 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" | 41 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" |
| 42 include_java_resources = true | 42 include_java_resources = true |
| 43 } | 43 } |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 | 274 |
| 275 android_aar_prebuilt("google_play_services_vision_java") { | 275 android_aar_prebuilt("google_play_services_vision_java") { |
| 276 deps = [ | 276 deps = [ |
| 277 ":google_play_services_base_java", | 277 ":google_play_services_base_java", |
| 278 ":google_play_services_basement_java", | 278 ":google_play_services_basement_java", |
| 279 ] | 279 ] |
| 280 _lib_name = "play-services-vision" | 280 _lib_name = "play-services-vision" |
| 281 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" | 281 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" |
| 282 ignore_manifest = true | 282 ignore_manifest = true |
| 283 } | 283 } |
| OLD | NEW |