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

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

Issue 2209233002: ▶ Update the Play services to 9.8 and load from AARs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mention the configuration file in the upload command line help Created 4 years, 1 month 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/update_test.py ('k') | chrome/android/java/proguard.flags » ('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 27 matching lines...) Expand all
38 } 38 }
39 39
40 android_java_prebuilt("emma_device") { 40 android_java_prebuilt("emma_device") {
41 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" 41 jar_path = "$android_sdk_root/tools/lib/emma_device.jar"
42 } 42 }
43 43
44 android_aar_prebuilt("android_support_design_java") { 44 android_aar_prebuilt("android_support_design_java") {
45 deps = [ 45 deps = [
46 ":android_support_v7_appcompat_java", 46 ":android_support_v7_appcompat_java",
47 ] 47 ]
48 lib_name = "design" 48 _lib_name = "design"
49 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 49 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
50 } 50 }
51 51
52 android_aar_prebuilt("android_support_multidex_java") { 52 android_aar_prebuilt("android_support_multidex_java") {
53 # TODO(jbudorick): remove requires_android after crbug.com/522043 is fixed. 53 # TODO(jbudorick): remove requires_android after crbug.com/522043 is fixed.
54 requires_android = false 54 requires_android = false
55 aar_path = "$lib_path/multidex/1.0.1/multidex-1.0.1.aar" 55 aar_path = "$lib_path/multidex/1.0.1/multidex-1.0.1.aar"
56 } 56 }
57 57
58 android_java_prebuilt("android_support_annotations_java") { 58 android_java_prebuilt("android_support_annotations_java") {
59 lib_name = "support-annotations" 59 _lib_name = "support-annotations"
60 jar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.jar" 60 jar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.jar"
61 } 61 }
62 62
63 android_aar_prebuilt("android_support_v4_java") { 63 android_aar_prebuilt("android_support_v4_java") {
64 lib_name = "support-v4" 64 _lib_name = "support-v4"
65 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 65 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
66 ignore_aidl = true # We don't appear to need these currently. 66 ignore_aidl = true # We don't appear to need these currently.
67 } 67 }
68 68
69 android_aar_prebuilt("android_support_v13_java") { 69 android_aar_prebuilt("android_support_v13_java") {
70 deps = [ 70 deps = [
71 ":android_support_annotations_java", 71 ":android_support_annotations_java",
72 ":android_support_v4_java", 72 ":android_support_v4_java",
73 ] 73 ]
74 lib_name = "support-v13" 74 _lib_name = "support-v13"
75 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 75 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
76 } 76 }
77 77
78 android_aar_prebuilt("android_support_vector_drawable_java") { 78 android_aar_prebuilt("android_support_vector_drawable_java") {
79 lib_name = "support-vector-drawable" 79 _lib_name = "support-vector-drawable"
80 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 80 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
81 } 81 }
82 82
83 android_aar_prebuilt("android_support_v7_appcompat_java_internal") { 83 android_aar_prebuilt("android_support_v7_appcompat_java_internal") {
84 lib_name = "appcompat-v7" 84 _lib_name = "appcompat-v7"
85 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 85 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
86 } 86 }
87 87
88 java_group("android_support_v7_appcompat_java") { 88 java_group("android_support_v7_appcompat_java") {
89 deps = [ 89 deps = [
90 ":android_support_v4_java", 90 ":android_support_v4_java",
91 ":android_support_v7_appcompat_java_internal", 91 ":android_support_v7_appcompat_java_internal",
92 ":android_support_vector_drawable_java", 92 ":android_support_vector_drawable_java",
93 ] 93 ]
94 } 94 }
95 95
96 android_aar_prebuilt("android_support_v7_mediarouter_java") { 96 android_aar_prebuilt("android_support_v7_mediarouter_java") {
97 deps = [ 97 deps = [
98 ":android_support_v7_appcompat_java", 98 ":android_support_v7_appcompat_java",
99 ] 99 ]
100 lib_name = "mediarouter-v7" 100 _lib_name = "mediarouter-v7"
101 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 101 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
102 } 102 }
103 103
104 android_aar_prebuilt("android_support_v7_recyclerview_java") { 104 android_aar_prebuilt("android_support_v7_recyclerview_java") {
105 deps = [ 105 deps = [
106 ":android_support_v7_appcompat_java", 106 ":android_support_v7_appcompat_java",
107 ] 107 ]
108 lib_name = "recyclerview-v7" 108 _lib_name = "recyclerview-v7"
109 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 109 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
110 } 110 }
111 111
112 android_resources("google_play_services_default_resources") { 112 # TODO(dgn): Remove this once no other target has a dependency on it
113 v14_skip = true 113 java_group("google_play_services_default_resources") {
114 resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libpro ject/google-play-services_lib/res" ] 114 deps = []
115 custom_package = "com.google.android.gms"
116 } 115 }
117 116
118 android_java_prebuilt("google_play_services_default_java") { 117 # TODO(dgn): Remove this once other targets register dependencies on only the
118 # modules they need.
119 java_group("google_play_services_default_java") {
119 deps = [ 120 deps = [
120 ":android_support_annotations_java", 121 ":google_play_services_auth_base_java",
121 ":android_support_v4_java", 122 ":google_play_services_auth_java",
122 ":android_support_v7_mediarouter_java", 123 ":google_play_services_base_java",
123 ":google_play_services_default_resources", 124 ":google_play_services_basement_java",
125 ":google_play_services_cast_java",
126 ":google_play_services_gcm_java",
127 ":google_play_services_iid_java",
128 ":google_play_services_nearby_java",
124 ] 129 ]
125 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
126 proguard_preprocess = true
127 proguard_preprocess_config = "//third_party/android_tools/proguard.flags"
128 proguard_configs =
129 [ "//build/secondary/third_party/android_tools/apk_proguard.flags" ]
130 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar"
131 } 130 }
132 131
133 android_aar_prebuilt("android_support_v17_leanback_java") { 132 android_aar_prebuilt("android_support_v17_leanback_java") {
134 deps = [ 133 deps = [
135 ":android_support_v7_recyclerview_java", 134 ":android_support_v7_recyclerview_java",
136 ] 135 ]
137 lib_name = "leanback-v17" 136 _lib_name = "leanback-v17"
138 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 137 aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
139 } 138 }
140 139
141 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 140 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
142 android_java_prebuilt("legacy_http_javalib") { 141 android_java_prebuilt("legacy_http_javalib") {
143 testonly = true 142 testonly = true
144 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 143 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
145 } 144 }
145
146 # TODO(dgn): Use the POM files instead of hardcoding the dependencies.
147 gms_path = "$android_sdk_root/extras/google/m2repository/com/google/android/gms"
148 gms_version = "9.8.0"
149
150 android_aar_prebuilt("google_play_services_basement_java") {
151 deps = [
152 ":android_support_v4_java",
153 ]
154 _lib_name = "play-services-basement"
155 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
156 input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
157 ignore_manifest = true
158 }
159
160 android_aar_prebuilt("google_play_services_tasks_java") {
161 deps = [
162 ":google_play_services_basement_java",
163 ]
164 _lib_name = "play-services-tasks"
165 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
166 ignore_manifest = true
167 }
168
169 android_aar_prebuilt("google_play_services_base_java") {
170 deps = [
171 ":google_play_services_basement_java",
172 ":google_play_services_tasks_java",
173 ]
174 _lib_name = "play-services-base"
175 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
176 ignore_manifest = true
177 }
178
179 android_aar_prebuilt("google_play_services_auth_base_java") {
180 deps = [
181 ":google_play_services_base_java",
182 ":google_play_services_basement_java",
183 ]
184 _lib_name = "play-services-auth-base"
185 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
186 ignore_manifest = true
187 }
188
189 android_aar_prebuilt("google_play_services_auth_java") {
190 deps = [
191 ":google_play_services_auth_base_java",
192 ":google_play_services_base_java",
193 ":google_play_services_basement_java",
194 ]
195 _lib_name = "play-services-auth"
196 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
197 ignore_manifest = true
198 }
199
200 android_aar_prebuilt("google_play_services_cast_java") {
201 deps = [
202 ":android_support_v7_mediarouter_java",
203 ":google_play_services_base_java",
204 ":google_play_services_basement_java",
205 ]
206 _lib_name = "play-services-cast"
207 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
208 ignore_manifest = true
209 }
210
211 android_aar_prebuilt("google_play_services_iid_java") {
212 deps = [
213 ":google_play_services_base_java",
214 ":google_play_services_basement_java",
215 ]
216 _lib_name = "play-services-iid"
217 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
218 ignore_manifest = true
219 }
220
221 android_aar_prebuilt("google_play_services_gcm_java") {
222 deps = [
223 ":google_play_services_base_java",
224 ":google_play_services_basement_java",
225 ":google_play_services_iid_java",
226 ]
227 _lib_name = "play-services-gcm"
228 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
229 ignore_manifest = true
230 }
231
232 android_aar_prebuilt("google_play_services_nearby_java") {
233 deps = [
234 ":google_play_services_base_java",
235 ":google_play_services_basement_java",
236 ]
237 _lib_name = "play-services-nearby"
238 aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
239 ignore_manifest = true
240 }
OLDNEW
« no previous file with comments | « build/android/play_services/update_test.py ('k') | chrome/android/java/proguard.flags » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698