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

Side by Side Diff: components/cronet.gypi

Issue 933293003: [Cronet] Make Cronet buildable on regular Android bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix url.gyp formatting. Created 5 years, 9 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 | « no previous file | net/net.gyp » ('j') | url/url.gyp » ('J')
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 # TODO(mef): Figure out what needs to be done for gn script. 8 # TODO(mef): Figure out what needs to be done for gn script.
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 '<(template_input_path)', 93 '<(template_input_path)',
94 '<(output_path)', 94 '<(output_path)',
95 ], 95 ],
96 'message': 'Generating version information', 96 'message': 'Generating version information',
97 }, 97 },
98 ], 98 ],
99 }, 99 },
100 { 100 {
101 'target_name': 'cronet_static', 101 'target_name': 'cronet_static',
102 'type': 'static_library', 102 'type': 'static_library',
103 'defines': [
104 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
105 'DISABLE_FILE_SUPPORT=1',
106 'DISABLE_FTP_SUPPORT=1',
107 ],
103 'dependencies': [ 108 'dependencies': [
104 '../base/base.gyp:base', 109 '../base/base.gyp:base',
105 '../base/base.gyp:base_i18n',
106 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 110 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
107 '../third_party/icu/icu.gyp:icui18n',
108 '../third_party/icu/icu.gyp:icuuc',
109 'cronet_jni_headers', 111 'cronet_jni_headers',
110 'cronet_url_request_context_config_list', 112 'cronet_url_request_context_config_list',
111 'cronet_url_request_java', 113 'cronet_url_request_java',
112 'cronet_version', 114 'cronet_version',
113 'metrics', 115 'metrics',
114 '../net/net.gyp:net', 116 '../net/net.gyp:net_small',
115 ], 117 ],
116 'sources': [ 118 'sources': [
117 'cronet/android/chromium_url_request.cc', 119 'cronet/android/chromium_url_request.cc',
118 'cronet/android/chromium_url_request.h', 120 'cronet/android/chromium_url_request.h',
119 'cronet/android/chromium_url_request_context.cc', 121 'cronet/android/chromium_url_request_context.cc',
120 'cronet/android/chromium_url_request_context.h', 122 'cronet/android/chromium_url_request_context.h',
121 'cronet/android/chromium_url_request_error_list.h', 123 'cronet/android/chromium_url_request_error_list.h',
122 'cronet/android/chromium_url_request_priority_list.h', 124 'cronet/android/chromium_url_request_priority_list.h',
123 'cronet/android/cronet_histogram_manager.cc', 125 'cronet/android/cronet_histogram_manager.cc',
124 'cronet/android/cronet_histogram_manager.h', 126 'cronet/android/cronet_histogram_manager.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 }, 173 },
172 { 174 {
173 'target_name': 'libcronet', 175 'target_name': 'libcronet',
174 'type': 'shared_library', 176 'type': 'shared_library',
175 'sources': [ 177 'sources': [
176 'cronet/android/cronet_jni.cc', 178 'cronet/android/cronet_jni.cc',
177 ], 179 ],
178 'dependencies': [ 180 'dependencies': [
179 'cronet_static', 181 'cronet_static',
180 '../base/base.gyp:base', 182 '../base/base.gyp:base',
181 '../net/net.gyp:net', 183 '../net/net.gyp:net_small',
182 '../url/url.gyp:url_lib', 184 '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
183 ], 185 ],
184 }, 186 },
185 { # cronet_stub.jar defines HttpUrlRequest interface and provides its 187 { # cronet_stub.jar defines HttpUrlRequest interface and provides its
186 # its implementation using HttpUrlConnection (not the Chromium stack). 188 # its implementation using HttpUrlConnection (not the Chromium stack).
187 'target_name': 'cronet_stub', 189 'target_name': 'cronet_stub',
188 'type': 'none', 190 'type': 'none',
189 'dependencies': [ 191 'dependencies': [
190 'cronet_url_request_context_config_list', 192 'cronet_url_request_context_config_list',
191 'cronet_version', 193 'cronet_version',
192 ], 194 ],
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 'files': [ 522 'files': [
521 '<(SHARED_LIB_DIR)/<(native_lib)', 523 '<(SHARED_LIB_DIR)/<(native_lib)',
522 ], 524 ],
523 }, 525 },
524 ], 526 ],
525 }, 527 },
526 ], 528 ],
527 }], # OS=="android" and use_icu_alternatives_on_android==1 529 }], # OS=="android" and use_icu_alternatives_on_android==1
528 ], 530 ],
529 } 531 }
OLDNEW
« no previous file with comments | « no previous file | net/net.gyp » ('j') | url/url.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698