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

Side by Side Diff: net/net.gyp

Issue 1131803002: [Android] Fix race condition in BaseTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 'conditions': [ 10 'conditions': [
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 'includes': [ '../build/java_aidl.gypi' ], 1392 'includes': [ '../build/java_aidl.gypi' ],
1393 }, 1393 },
1394 { 1394 {
1395 'target_name': 'net_java_test_support', 1395 'target_name': 'net_java_test_support',
1396 'type': 'none', 1396 'type': 'none',
1397 'variables': { 1397 'variables': {
1398 'java_in_dir': '../net/test/android/javatests', 1398 'java_in_dir': '../net/test/android/javatests',
1399 }, 1399 },
1400 'dependencies': [ 1400 'dependencies': [
1401 'url_request_failed_job_java', 1401 'url_request_failed_job_java',
1402 '../base/base.gyp:base_java'
1402 ], 1403 ],
1403 'includes': [ '../build/java.gypi' ], 1404 'includes': [ '../build/java.gypi' ],
1404 }, 1405 },
1405 { 1406 {
1406 'target_name': 'url_request_failed_job_java', 1407 'target_name': 'url_request_failed_job_java',
1407 'type': 'none', 1408 'type': 'none',
1408 'variables': { 1409 'variables': {
1409 'source_file': 'test/url_request/url_request_failed_job.h', 1410 'source_file': 'test/url_request/url_request_failed_job.h',
1410 }, 1411 },
1411 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1412 'includes': [ '../build/android/java_cpp_enum.gypi' ],
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 '../build/isolate.gypi', 1539 '../build/isolate.gypi',
1539 ], 1540 ],
1540 'sources': [ 1541 'sources': [
1541 'net_unittests.isolate', 1542 'net_unittests.isolate',
1542 ], 1543 ],
1543 }, 1544 },
1544 ], 1545 ],
1545 }], 1546 }],
1546 ], 1547 ],
1547 } 1548 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698