| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 android_java_prebuilt("google_play_services_default_java") { | 119 android_java_prebuilt("google_play_services_default_java") { |
| 120 deps = [ | 120 deps = [ |
| 121 ":android_support_annotations_java", | 121 ":android_support_annotations_java", |
| 122 ":android_support_v4_java", | 122 ":android_support_v4_java", |
| 123 ":android_support_v7_mediarouter_java", | 123 ":android_support_v7_mediarouter_java", |
| 124 ":google_play_services_default_resources", | 124 ":google_play_services_default_resources", |
| 125 ] | 125 ] |
| 126 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ] | 126 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ] |
| 127 proguard_preprocess = true | 127 proguard_preprocess = true |
| 128 proguard_preprocess_config = "//third_party/android_tools/proguard.flags" | 128 proguard_preprocess_config = "//third_party/android_tools/proguard.flags" |
| 129 proguard_configs = |
| 130 [ "//build/secondary/third_party/android_tools/apk_proguard.flags" ] |
| 129 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go
ogle-play-services_lib/libs/google-play-services.jar" | 131 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go
ogle-play-services_lib/libs/google-play-services.jar" |
| 130 } | 132 } |
| 131 | 133 |
| 132 android_aar_prebuilt("android_support_v17_leanback_java") { | 134 android_aar_prebuilt("android_support_v17_leanback_java") { |
| 133 deps = [ | 135 deps = [ |
| 134 ":android_support_v7_recyclerview_java", | 136 ":android_support_v7_recyclerview_java", |
| 135 ] | 137 ] |
| 136 lib_name = "leanback-v17" | 138 lib_name = "leanback-v17" |
| 137 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" | 139 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" |
| 138 } | 140 } |
| 139 | 141 |
| 140 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. | 142 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. |
| 141 android_java_prebuilt("legacy_http_javalib") { | 143 android_java_prebuilt("legacy_http_javalib") { |
| 142 testonly = true | 144 testonly = true |
| 143 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" | 145 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" |
| 144 } | 146 } |
| OLD | NEW |