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

Side by Side 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, 5 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
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 = [ "ndk/sources/android/cpufeatures" ] 8 include_dirs = [ "ndk/sources/android/cpufeatures" ]
9 } 9 }
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 android_resources("google_play_services_default_resources") { 120 android_resources("google_play_services_default_resources") {
121 v14_skip = true 121 v14_skip = true
122 resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libpro ject/google-play-services_lib/res" ] 122 resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libpro ject/google-play-services_lib/res" ]
123 custom_package = "com.google.android.gms" 123 custom_package = "com.google.android.gms"
124 } 124 }
125 android_java_prebuilt("google_play_services_default_java") { 125 android_java_prebuilt("google_play_services_default_java") {
126 deps = [ 126 deps = [
127 ":android_support_v13_java", 127 ":android_support_v13_java",
128 ":android_support_v7_mediarouter_java", 128 ":android_support_v7_mediarouter_java",
129 ":google_play_services_default_resources", 129 ":google_play_services_default_resources",
130 ":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
131 ] 130 ]
131 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
132 proguard_preprocess = true 132 proguard_preprocess = true
133 proguard_config = "//third_party/android_tools/proguard.flags" 133 proguard_config = "//third_party/android_tools/proguard.flags"
134 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar" 134 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar"
135 } 135 }
136 136
137 android_resources("android_support_v17_leanback_resources") { 137 android_resources("android_support_v17_leanback_resources") {
138 v14_skip = true 138 v14_skip = true
139 resource_dirs = 139 resource_dirs =
140 [ "$android_sdk_root/extras/android/support/v17/leanback/res" ] 140 [ "$android_sdk_root/extras/android/support/v17/leanback/res" ]
141 custom_package = "android.support.v17.leanback" 141 custom_package = "android.support.v17.leanback"
142 } 142 }
143 143
144 android_java_prebuilt("android_support_v17_leanback_java") { 144 android_java_prebuilt("android_support_v17_leanback_java") {
145 deps = [ 145 deps = [
146 ":android_support_v17_leanback_resources", 146 ":android_support_v17_leanback_resources",
147 ":android_support_v7_recyclerview_java", 147 ":android_support_v7_recyclerview_java",
148 ] 148 ]
149 jar_path = "$android_sdk_root/extras/android/support/v17/leanback/libs/android -support-v17-leanback.jar" 149 jar_path = "$android_sdk_root/extras/android/support/v17/leanback/libs/android -support-v17-leanback.jar"
150 } 150 }
151 151
152 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 152 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
153 android_java_prebuilt("legacy_http_javalib") { 153 android_java_prebuilt("legacy_http_javalib") {
154 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
154 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 155 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
155 } 156 }
OLDNEW
« 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