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

Unified Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 2103193002: 🎏 Fix google_play_services_default_java including legacy_http_javalib as a dep rather tha (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 379b9d09d5f636be300b001ccf506dada3ebe37f..a38f909da4fea1a9c504e02f9b754b6b8ff92039 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -127,8 +127,8 @@ android_java_prebuilt("google_play_services_default_java") {
":android_support_v13_java",
":android_support_v7_mediarouter_java",
":google_play_services_default_resources",
- ":legacy_http_javalib",
paulmiller 2016/06/28 18:10:21 If not here, then where is "legacy_http_javalib" b
agrieve 2016/06/28 18:35:05 It's still used by some test targets. Possible tha
]
+ input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
proguard_preprocess = true
proguard_config = "//third_party/android_tools/proguard.flags"
jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
@@ -151,5 +151,6 @@ android_java_prebuilt("android_support_v17_leanback_java") {
# TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
android_java_prebuilt("legacy_http_javalib") {
+ testonly = true
paulmiller 2016/06/28 18:10:21 What does "testonly" do?
agrieve 2016/06/28 18:35:05 It will make gn gen fail if any target not marked
jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
}
« build/config/android/internal_rules.gni ('K') | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698