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

Side by Side Diff: components/cronet.gypi

Issue 2132033002: Revert of Remove android_support_annotations target. (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
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | components/cronet/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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'cronet_jni_headers', 10 'target_name': 'cronet_jni_headers',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 { # cronet_api.jar defines Cronet API and provides implementation of 243 { # cronet_api.jar defines Cronet API and provides implementation of
244 # legacy api using HttpUrlConnection (not the Chromium stack). 244 # legacy api using HttpUrlConnection (not the Chromium stack).
245 'target_name': 'cronet_api', 245 'target_name': 'cronet_api',
246 'type': 'none', 246 'type': 'none',
247 'dependencies': [ 247 'dependencies': [
248 'http_cache_type_java', 248 'http_cache_type_java',
249 'url_request_error_java', 249 'url_request_error_java',
250 'cronet_version', 250 'cronet_version',
251 'load_states_list', 251 'load_states_list',
252 'network_quality_observation_source_java', 252 'network_quality_observation_source_java',
253 '../third_party/android_tools/android_tools.gyp:android_support_v13_ java', 253 '../third_party/android_tools/android_tools.gyp:android_support_anno tations_javalib',
254 ], 254 ],
255 'variables': { 255 'variables': {
256 'java_in_dir': 'cronet/android/api', 256 'java_in_dir': 'cronet/android/api',
257 'run_findbugs': 1, 257 'run_findbugs': 1,
258 }, 258 },
259 'includes': [ '../build/java.gypi' ], 259 'includes': [ '../build/java.gypi' ],
260 }, 260 },
261 { # cronet.jar implements HttpUrlRequest interface using Chromium stack 261 { # cronet.jar implements HttpUrlRequest interface using Chromium stack
262 # in native libcronet.so library. 262 # in native libcronet.so library.
263 'target_name': 'cronet_java', 263 'target_name': 'cronet_java',
264 'type': 'none', 264 'type': 'none',
265 'dependencies': [ 265 'dependencies': [
266 '../base/base.gyp:base', 266 '../base/base.gyp:base',
267 'cronet_api', 267 'cronet_api',
268 'chromium_url_request_java', 268 'chromium_url_request_java',
269 'libcronet', 269 'libcronet',
270 'net_request_priority_java', 270 'net_request_priority_java',
271 'network_quality_observation_source_java', 271 'network_quality_observation_source_java',
272 '../third_party/android_tools/android_tools.gyp:android_support_v13_ java', 272 '../third_party/android_tools/android_tools.gyp:android_support_anno tations_javalib',
273 ], 273 ],
274 'variables': { 274 'variables': {
275 'java_in_dir': 'cronet/android/java', 275 'java_in_dir': 'cronet/android/java',
276 'javac_includes': [ 276 'javac_includes': [
277 '**/ChromiumUrlRequest.java', 277 '**/ChromiumUrlRequest.java',
278 '**/ChromiumUrlRequestContext.java', 278 '**/ChromiumUrlRequestContext.java',
279 '**/ChromiumUrlRequestError.java', 279 '**/ChromiumUrlRequestError.java',
280 '**/ChromiumUrlRequestFactory.java', 280 '**/ChromiumUrlRequestFactory.java',
281 '**/ChromiumUrlRequestPriority.java', 281 '**/ChromiumUrlRequestPriority.java',
282 '**/CronetBidirectionalStream.java', 282 '**/CronetBidirectionalStream.java',
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 'cronet/ios/test/cronet_bidirectional_stream_test.mm', 953 'cronet/ios/test/cronet_bidirectional_stream_test.mm',
954 'cronet/ios/test/cronet_test_runner.mm', 954 'cronet/ios/test/cronet_test_runner.mm',
955 ], 955 ],
956 }, 956 },
957 ], 957 ],
958 }, 958 },
959 ], 959 ],
960 }], # OS=="ios" 960 }], # OS=="ios"
961 ], 961 ],
962 } 962 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | components/cronet/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698