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

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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 }, 1387 },
1388 'sources': [ 1388 'sources': [
1389 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aid l', 1389 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aid l',
1390 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCall backs.aidl', 1390 '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCall backs.aidl',
1391 ], 1391 ],
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 'dependencies': [
1398 '../base/base.gyp:base_java'
1399 ],
1397 'variables': { 1400 'variables': {
1398 'java_in_dir': '../net/test/android/javatests', 1401 'java_in_dir': '../net/test/android/javatests',
1399 }, 1402 },
1400 'includes': [ '../build/java.gypi' ], 1403 'includes': [ '../build/java.gypi' ],
1401 }, 1404 },
1402 { 1405 {
1403 'target_name': 'net_javatests', 1406 'target_name': 'net_javatests',
1404 'type': 'none', 1407 'type': 'none',
1405 'variables': { 1408 'variables': {
1406 'java_in_dir': '../net/android/javatests', 1409 'java_in_dir': '../net/android/javatests',
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 '../build/isolate.gypi', 1530 '../build/isolate.gypi',
1528 ], 1531 ],
1529 'sources': [ 1532 'sources': [
1530 'net_unittests.isolate', 1533 'net_unittests.isolate',
1531 ], 1534 ],
1532 }, 1535 },
1533 ], 1536 ],
1534 }], 1537 }],
1535 ], 1538 ],
1536 } 1539 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698