| 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 = [ "ndk/sources/android/cpufeatures" ] | 8 include_dirs = [ "ndk/sources/android/cpufeatures" ] |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 # Must be after no_chromium_code for warning flags to be ordered correctly. | 30 # Must be after no_chromium_code for warning flags to be ordered correctly. |
| 31 ":cpu_features_warnings", | 31 ":cpu_features_warnings", |
| 32 ] | 32 ] |
| 33 } | 33 } |
| 34 | 34 |
| 35 android_java_prebuilt("android_gcm_java") { | 35 android_java_prebuilt("android_gcm_java") { |
| 36 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" | 36 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" |
| 37 } | 37 } |
| 38 | 38 |
| 39 android_java_prebuilt("emma_device") { |
| 40 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" |
| 41 } |
| 42 |
| 39 android_java_prebuilt("uiautomator_java") { | 43 android_java_prebuilt("uiautomator_java") { |
| 40 jar_path = "$android_sdk/uiautomator.jar" | 44 jar_path = "$android_sdk/uiautomator.jar" |
| 41 } | 45 } |
| 42 | 46 |
| 43 android_java_prebuilt("android_support_annotations_javalib") { | 47 android_java_prebuilt("android_support_annotations_javalib") { |
| 44 jar_path = "$android_sdk_root/extras/android/support/annotations/android-suppo
rt-annotations.jar" | 48 jar_path = "$android_sdk_root/extras/android/support/annotations/android-suppo
rt-annotations.jar" |
| 45 } | 49 } |
| 46 | 50 |
| 47 java_prebuilt("android_support_multidex_java") { | 51 java_prebuilt("android_support_multidex_java") { |
| 48 supports_android = true | 52 supports_android = true |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 ] | 119 ] |
| 116 proguard_preprocess = true | 120 proguard_preprocess = true |
| 117 proguard_config = "//third_party/android_tools/proguard.flags" | 121 proguard_config = "//third_party/android_tools/proguard.flags" |
| 118 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go
ogle-play-services_lib/libs/google-play-services.jar" | 122 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go
ogle-play-services_lib/libs/google-play-services.jar" |
| 119 } | 123 } |
| 120 | 124 |
| 121 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. | 125 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. |
| 122 android_java_prebuilt("legacy_http_javalib") { | 126 android_java_prebuilt("legacy_http_javalib") { |
| 123 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" | 127 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" |
| 124 } | 128 } |
| OLD | NEW |