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

Side by Side Diff: net/net.gyp

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
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 # Defines an extra set of libs with an alternate copy of org.apache.http. 8 # Defines an extra set of libs with an alternate copy of org.apache.http.
9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
10 'net_test_extra_libs': [], 10 'net_test_extra_libs': [],
(...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 ], 1416 ],
1417 'includes': [ '../build/java_aidl.gypi' ], 1417 'includes': [ '../build/java_aidl.gypi' ],
1418 }, 1418 },
1419 { 1419 {
1420 'target_name': 'net_java_test_support', 1420 'target_name': 'net_java_test_support',
1421 'type': 'none', 1421 'type': 'none',
1422 'variables': { 1422 'variables': {
1423 'java_in_dir': '../net/test/android/javatests', 1423 'java_in_dir': '../net/test/android/javatests',
1424 }, 1424 },
1425 'dependencies': [ 1425 'dependencies': [
1426 'net_test_support',
1427 'url_request_failed_job_java', 1426 'url_request_failed_job_java',
1428 '../base/base.gyp:base_java', 1427 '../base/base.gyp:base_java',
1429 'net_java', 1428 'net_java',
1430 '<@(net_test_extra_libs)', 1429 '<@(net_test_extra_libs)',
1431 ], 1430 ],
1432 'includes': [ '../build/java.gypi' ], 1431 'includes': [ '../build/java.gypi' ],
1433 }, 1432 },
1434 { 1433 {
1435 'target_name': 'url_request_failed_job_java', 1434 'target_name': 'url_request_failed_job_java',
1436 'type': 'none', 1435 'type': 'none',
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 '../build/isolate.gypi', 1590 '../build/isolate.gypi',
1592 ], 1591 ],
1593 'sources': [ 1592 'sources': [
1594 'net_unittests.isolate', 1593 'net_unittests.isolate',
1595 ], 1594 ],
1596 }, 1595 },
1597 ], 1596 ],
1598 }], 1597 }],
1599 ], 1598 ],
1600 } 1599 }
OLDNEW
« no previous file with comments | « net/android/BUILD.gn ('k') | net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698