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

Side by Side Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 2700993002: Roll the Google Play Services SDK to v10.2.0 (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « build/android/play_services/google_play_services_library.zip.sha1 ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 179 }
180 180
181 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 181 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
182 android_java_prebuilt("legacy_http_javalib") { 182 android_java_prebuilt("legacy_http_javalib") {
183 testonly = true 183 testonly = true
184 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 184 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
185 } 185 }
186 186
187 # TODO(dgn): Use the POM files instead of hardcoding the dependencies. 187 # TODO(dgn): Use the POM files instead of hardcoding the dependencies.
188 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/goog le/android/gms" 188 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/goog le/android/gms"
189 gms_version = "10.0.1" 189 gms_version = "10.2.0"
190 190
191 android_aar_prebuilt("google_play_services_basement_java") { 191 android_aar_prebuilt("google_play_services_basement_java") {
192 deps = [ 192 deps = [
193 ":android_support_v4_java", 193 ":android_support_v4_java",
194 ] 194 ]
195 _lib_name = "play-services-basement" 195 _lib_name = "play-services-basement"
196 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" 196 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
197 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ] 197 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
198 ignore_manifest = true 198 ignore_manifest = true
199 } 199 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 android_aar_prebuilt("google_play_services_vision_java") { 283 android_aar_prebuilt("google_play_services_vision_java") {
284 deps = [ 284 deps = [
285 ":google_play_services_base_java", 285 ":google_play_services_base_java",
286 ":google_play_services_basement_java", 286 ":google_play_services_basement_java",
287 ] 287 ]
288 _lib_name = "play-services-vision" 288 _lib_name = "play-services-vision"
289 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" 289 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
290 ignore_manifest = true 290 ignore_manifest = true
291 } 291 }
OLDNEW
« no previous file with comments | « build/android/play_services/google_play_services_library.zip.sha1 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698