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

Side by Side Diff: components/cronet.gypi

Issue 286033006: Add url_java.jar, AUTHORS, LICENSE and VERSION to cronet package. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make cronet targets conditioned on use_icu_alternatives_on_android. Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | components/cronet/tools/cronet_licenses.py » ('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" and use_icu_alternatives_on_android==1', {
8 # TODO(mef): Consider moving all Cronet Android targets into separate 8 # TODO(mef): Figure out what needs to be done for gn script.
9 # file. Also figure out what needs to be done for gn script.
10 'targets': [ 9 'targets': [
11 { 10 {
12 'target_name': 'cronet_jni_headers', 11 'target_name': 'cronet_jni_headers',
13 'type': 'none', 12 'type': 'none',
14 'sources': [ 13 'sources': [
15 'cronet/android/java/src/org/chromium/net/UrlRequest.java', 14 'cronet/android/java/src/org/chromium/net/UrlRequest.java',
16 'cronet/android/java/src/org/chromium/net/UrlRequestContext.java', 15 'cronet/android/java/src/org/chromium/net/UrlRequestContext.java',
17 ], 16 ],
18 'variables': { 17 'variables': {
19 'jni_gen_package': 'cronet', 18 'jni_gen_package': 'cronet',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'], 132 'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'],
134 'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)' ], 133 'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)' ],
135 'action': [ 134 'action': [
136 '<(android_strip)', 135 '<(android_strip)',
137 '--strip-unneeded', 136 '--strip-unneeded',
138 '<@(_inputs)', 137 '<@(_inputs)',
139 '-o', 138 '-o',
140 '<@(_outputs)', 139 '<@(_outputs)',
141 ], 140 ],
142 }, 141 },
142 {
143 'action_name': 'generate licenses',
144 'inputs': ['cronet/tools/cronet_licenses.py'] ,
145 'outputs': ['<(package_dir)/LICENSE'],
146 'action': [
147 'python',
148 '<@(_inputs)',
149 'license',
150 '<@(_outputs)',
151 ],
152 },
143 ], 153 ],
144 'copies': [ 154 'copies': [
145 { 155 {
146 'destination': '<(package_dir)/libs', 156 'destination': '<(package_dir)',
147 'files': [ 157 'files': [
158 '../AUTHORS',
159 '../chrome/VERSION',
148 '<(PRODUCT_DIR)/lib.java/<(java_lib)', 160 '<(PRODUCT_DIR)/lib.java/<(java_lib)',
149 '<(PRODUCT_DIR)/lib.java/base_java.jar', 161 '<(PRODUCT_DIR)/lib.java/base_java.jar',
150 '<(PRODUCT_DIR)/lib.java/net_java.jar', 162 '<(PRODUCT_DIR)/lib.java/net_java.jar',
163 '<(PRODUCT_DIR)/lib.java/url_java.jar',
151 ], 164 ],
152 }, 165 },
153 ], 166 ],
154 }, 167 },
155 { 168 {
156 'target_name': 'cronet_sample_apk', 169 'target_name': 'cronet_sample_apk',
157 'type': 'none', 170 'type': 'none',
158 'dependencies': [ 171 'dependencies': [
159 'cronet', 172 'cronet',
160 ], 173 ],
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 'java_in_dir': 'cronet/android/sample/javatests', 209 'java_in_dir': 'cronet/android/sample/javatests',
197 'resource_dir': 'cronet/android/sample/res', 210 'resource_dir': 'cronet/android/sample/res',
198 'is_test_apk': 1, 211 'is_test_apk': 1,
199 }, 212 },
200 'includes': [ '../build/java_apk.gypi' ], 213 'includes': [ '../build/java_apk.gypi' ],
201 }, 214 },
202 ], 215 ],
203 }], # OS=="android" 216 }], # OS=="android"
204 ], 217 ],
205 } 218 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet/tools/cronet_licenses.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698