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

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

Issue 2793033003: [Android] Remove org.apache.http from proguard flags and gn. (Closed)
Patch Set: rebase and git cl format Created 3 years, 8 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 | « android_webview/test/BUILD.gn ('k') | chrome/android/BUILD.gn » ('j') | 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 ":google_play_services_base_java", 207 ":google_play_services_base_java",
208 ":google_play_services_basement_java", 208 ":google_play_services_basement_java",
209 ":google_play_services_cast_java", 209 ":google_play_services_cast_java",
210 ":google_play_services_gcm_java", 210 ":google_play_services_gcm_java",
211 ":google_play_services_iid_java", 211 ":google_play_services_iid_java",
212 ":google_play_services_nearby_java", 212 ":google_play_services_nearby_java",
213 ":google_play_services_vision_java", 213 ":google_play_services_vision_java",
214 ] 214 ]
215 } 215 }
216 216
217 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
218 android_java_prebuilt("legacy_http_javalib") {
219 testonly = true
220 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
221 }
222
223 # TODO(dgn): Use the POM files instead of hardcoding the dependencies. 217 # TODO(dgn): Use the POM files instead of hardcoding the dependencies.
224 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/goog le/android/gms" 218 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/goog le/android/gms"
225 gms_version = "10.2.0" 219 gms_version = "10.2.0"
226 220
227 android_aar_prebuilt("google_play_services_basement_java") { 221 android_aar_prebuilt("google_play_services_basement_java") {
228 deps = [ 222 deps = [
229 ":android_support_v4_java", 223 ":android_support_v4_java",
230 ] 224 ]
231 _lib_name = "play-services-basement" 225 _lib_name = "play-services-basement"
232 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" 226 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 312
319 android_aar_prebuilt("google_play_services_vision_java") { 313 android_aar_prebuilt("google_play_services_vision_java") {
320 deps = [ 314 deps = [
321 ":google_play_services_base_java", 315 ":google_play_services_base_java",
322 ":google_play_services_basement_java", 316 ":google_play_services_basement_java",
323 ] 317 ]
324 _lib_name = "play-services-vision" 318 _lib_name = "play-services-vision"
325 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar" 319 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
326 ignore_manifest = true 320 ignore_manifest = true
327 } 321 }
OLDNEW
« no previous file with comments | « android_webview/test/BUILD.gn ('k') | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698