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

Side by Side Diff: base/base.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, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 'variables': { 1443 'variables': {
1444 'java_in_dir': '../base/android/java', 1444 'java_in_dir': '../base/android/java',
1445 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1445 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1446 }, 1446 },
1447 'dependencies': [ 1447 'dependencies': [
1448 'base_java_application_state', 1448 'base_java_application_state',
1449 'base_java_library_load_from_apk_status_codes', 1449 'base_java_library_load_from_apk_status_codes',
1450 'base_java_library_process_type', 1450 'base_java_library_process_type',
1451 'base_java_memory_pressure_level', 1451 'base_java_memory_pressure_level',
1452 'base_native_libraries_gen', 1452 'base_native_libraries_gen',
1453 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1453 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1454 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1454 ], 1455 ],
1455 'includes': [ '../build/java.gypi' ], 1456 'includes': [ '../build/java.gypi' ],
1456 }, 1457 },
1457 { 1458 {
1458 # GN: //base:base_java_unittest_support 1459 # GN: //base:base_java_unittest_support
1459 'target_name': 'base_java_unittest_support', 1460 'target_name': 'base_java_unittest_support',
1460 'type': 'none', 1461 'type': 'none',
1461 'dependencies': [ 1462 'dependencies': [
1462 'base_java', 1463 'base_java',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 'dependencies': [ 1501 'dependencies': [
1501 'base_java', 1502 'base_java',
1502 '../testing/android/on_device_instrumentation.gyp:reporter_java', 1503 '../testing/android/on_device_instrumentation.gyp:reporter_java',
1503 ], 1504 ],
1504 'variables': { 1505 'variables': {
1505 'java_in_dir': '../base/test/android/javatests', 1506 'java_in_dir': '../base/test/android/javatests',
1506 }, 1507 },
1507 'includes': [ '../build/java.gypi' ], 1508 'includes': [ '../build/java.gypi' ],
1508 }, 1509 },
1509 { 1510 {
1511 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l
1512 # in the multidex shadow library. crbug.com/522043
1513 # GN: //base:base_junit_test_support
1514 'target_name': 'base_junit_test_support',
1515 'type': 'none',
1516 'dependencies': [
1517 '../testing/android/junit/junit_test.gyp:junit_test_support',
1518 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1519 ],
1520 'variables': {
1521 'src_paths': [
1522 '../base/test/android/junit/',
1523 ],
1524 },
1525 'includes': [ '../build/host_jar.gypi' ]
1526 },
1527 {
1510 # GN: //base:base_junit_tests 1528 # GN: //base:base_junit_tests
1511 'target_name': 'base_junit_tests', 1529 'target_name': 'base_junit_tests',
1512 'type': 'none', 1530 'type': 'none',
1513 'dependencies': [ 1531 'dependencies': [
1514 'base_java', 1532 'base_java',
1515 'base_java_test_support', 1533 'base_java_test_support',
1534 'base_junit_test_support',
1516 '../testing/android/junit/junit_test.gyp:junit_test_support', 1535 '../testing/android/junit/junit_test.gyp:junit_test_support',
1517 ], 1536 ],
1518 'variables': { 1537 'variables': {
1519 'main_class': 'org.chromium.testing.local.JunitTestMain', 1538 'main_class': 'org.chromium.testing.local.JunitTestMain',
1520 'src_paths': [ 1539 'src_paths': [
1521 '../base/android/junit/', 1540 '../base/android/junit/',
1522 ], 1541 ],
1523 }, 1542 },
1524 'includes': [ '../build/host_jar.gypi' ], 1543 'includes': [ '../build/host_jar.gypi' ],
1525 }, 1544 },
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 '../build/isolate.gypi', 1657 '../build/isolate.gypi',
1639 ], 1658 ],
1640 'sources': [ 1659 'sources': [
1641 'base_unittests.isolate', 1660 'base_unittests.isolate',
1642 ], 1661 ],
1643 }, 1662 },
1644 ], 1663 ],
1645 }], 1664 }],
1646 ], 1665 ],
1647 } 1666 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698