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

Side by Side Diff: url/url.gyp

Issue 2215863002: Fix cronet build after JNI registration change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « url/android/url_jni_registrar.cc ('k') | url/url_canon_icu_alternatives_android.h » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'url_srcs.gypi', 10 'url_srcs.gypi',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 'url_canon_icu.h', 43 'url_canon_icu.h',
44 ], 44 ],
45 'conditions': [ 45 'conditions': [
46 ['OS == "android"', { 46 ['OS == "android"', {
47 'dependencies': [ 47 'dependencies': [
48 'url_java', 48 'url_java',
49 'url_jni_headers', 49 'url_jni_headers',
50 ], 50 ],
51 'sources': [ 51 'sources': [
52 'url_canon_icu_alternatives_android.cc', 52 'url_canon_icu_alternatives_android.cc',
53 'url_canon_icu_alternatives_android.h',
54 ], 53 ],
55 }], 54 }],
56 ['OS == "ios"', { 55 ['OS == "ios"', {
57 'sources': [ 56 'sources': [
58 'url_canon_icu_alternatives_ios.mm', 57 'url_canon_icu_alternatives_ios.mm',
59 ], 58 ],
60 }], 59 }],
61 ], 60 ],
62 }, 61 },
63 # 'use_platform_icu_alternatives != 1' 62 # 'use_platform_icu_alternatives != 1'
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 '../build/isolate.gypi', 283 '../build/isolate.gypi',
285 ], 284 ],
286 'sources': [ 285 'sources': [
287 'url_unittests.isolate', 286 'url_unittests.isolate',
288 ], 287 ],
289 }, 288 },
290 ], 289 ],
291 }], 290 }],
292 ], 291 ],
293 } 292 }
OLDNEW
« no previous file with comments | « url/android/url_jni_registrar.cc ('k') | url/url_canon_icu_alternatives_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698