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

Side by Side Diff: net/net.gyp

Issue 1318513003: [Android] Add gyp support for multidex. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add @VisibleForTesting to ChromiumMultiDex.install Created 5 years, 3 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/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java ('k') | no next file » | 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 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 }, 1538 },
1539 'includes': [ '../build/apk_test.gypi' ], 1539 'includes': [ '../build/apk_test.gypi' ],
1540 }, 1540 },
1541 { 1541 {
1542 'target_name': 'net_junit_tests', 1542 'target_name': 'net_junit_tests',
1543 'type': 'none', 1543 'type': 'none',
1544 'dependencies': [ 1544 'dependencies': [
1545 'net_java', 1545 'net_java',
1546 '../base/base.gyp:base', 1546 '../base/base.gyp:base',
1547 '../base/base.gyp:base_java_test_support', 1547 '../base/base.gyp:base_java_test_support',
1548 '../base/base.gyp:base_junit_test_support',
1548 '../testing/android/junit/junit_test.gyp:junit_test_support', 1549 '../testing/android/junit/junit_test.gyp:junit_test_support',
1549 ], 1550 ],
1550 'variables': { 1551 'variables': {
1551 'main_class': 'org.chromium.testing.local.JunitTestMain', 1552 'main_class': 'org.chromium.testing.local.JunitTestMain',
1552 'src_paths': [ 1553 'src_paths': [
1553 'android/junit/', 1554 'android/junit/',
1554 ], 1555 ],
1555 }, 1556 },
1556 'includes': [ 1557 'includes': [
1557 '../build/host_jar.gypi', 1558 '../build/host_jar.gypi',
(...skipping 29 matching lines...) Expand all
1587 '../build/isolate.gypi', 1588 '../build/isolate.gypi',
1588 ], 1589 ],
1589 'sources': [ 1590 'sources': [
1590 'net_unittests.isolate', 1591 'net_unittests.isolate',
1591 ], 1592 ],
1592 }, 1593 },
1593 ], 1594 ],
1594 }], 1595 }],
1595 ], 1596 ],
1596 } 1597 }
OLDNEW
« no previous file with comments | « net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698