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

Side by Side Diff: net/net.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 | « net/base/net_string_util_icu_alternatives_android.cc ('k') | net/test/run_all_unittests.cc » ('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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ], 110 ],
111 'includes': [ 'net_common.gypi' ], 111 'includes': [ 'net_common.gypi' ],
112 112
113 'conditions': [ 113 'conditions': [
114 # ICU Alternatives 114 # ICU Alternatives
115 ['use_platform_icu_alternatives == 1', { 115 ['use_platform_icu_alternatives == 1', {
116 'conditions': [ 116 'conditions': [
117 ['OS == "android"', { 117 ['OS == "android"', {
118 'sources': [ 118 'sources': [
119 'base/net_string_util_icu_alternatives_android.cc', 119 'base/net_string_util_icu_alternatives_android.cc',
120 'base/net_string_util_icu_alternatives_android.h',
121 ], 120 ],
122 }], 121 }],
123 ['OS == "ios"', { 122 ['OS == "ios"', {
124 'sources': [ 123 'sources': [
125 'base/net_string_util_icu_alternatives_ios.mm', 124 'base/net_string_util_icu_alternatives_ios.mm',
126 ], 125 ],
127 }], 126 }],
128 ], 127 ],
129 }, 128 },
130 # 'use_platform_icu_alternatives != 1' 129 # 'use_platform_icu_alternatives != 1'
(...skipping 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 '../build/isolate.gypi', 1703 '../build/isolate.gypi',
1705 ], 1704 ],
1706 'sources': [ 1705 'sources': [
1707 'net_unittests.isolate', 1706 'net_unittests.isolate',
1708 ], 1707 ],
1709 }, 1708 },
1710 ], 1709 ],
1711 }], 1710 }],
1712 ], 1711 ],
1713 } 1712 }
OLDNEW
« no previous file with comments | « net/base/net_string_util_icu_alternatives_android.cc ('k') | net/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698