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

Side by Side Diff: net/net.gyp

Issue 12730006: Android: rename android_build_type gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add bug # to comments Created 7 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 | Annotate | Revision Log
« no previous file with comments | « content/content_shell.gypi ('k') | skia/skia.gyp » ('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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_simple_cache_backend%': 0, 10 'use_simple_cache_backend%': 0,
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 'libraries': [ 1262 'libraries': [
1263 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', 1263 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
1264 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk', 1264 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk',
1265 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1265 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1266 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1266 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1267 '$(SDKROOT)/usr/lib/libresolv.dylib', 1267 '$(SDKROOT)/usr/lib/libresolv.dylib',
1268 ], 1268 ],
1269 }, 1269 },
1270 }, 1270 },
1271 ], 1271 ],
1272 ['OS=="android" and _toolset=="target" and android_build_type == 0', { 1272 ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
1273 'dependencies': [ 1273 'dependencies': [
1274 'net_java', 1274 'net_java',
1275 ], 1275 ],
1276 }], 1276 }],
1277 [ 'OS == "android"', { 1277 [ 'OS == "android"', {
1278 'dependencies': [ 1278 'dependencies': [
1279 '../third_party/openssl/openssl.gyp:openssl', 1279 '../third_party/openssl/openssl.gyp:openssl',
1280 'net_jni_headers', 1280 'net_jni_headers',
1281 ], 1281 ],
1282 'sources!': [ 1282 'sources!': [
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
2576 '--result', '<@(_outputs)', 2576 '--result', '<@(_outputs)',
2577 '--isolate', 'net_unittests.isolate', 2577 '--isolate', 'net_unittests.isolate',
2578 ], 2578 ],
2579 }, 2579 },
2580 ], 2580 ],
2581 }, 2581 },
2582 ], 2582 ],
2583 }], 2583 }],
2584 ], 2584 ],
2585 } 2585 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698