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

Side by Side Diff: base/base.gyp

Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix junit tests Created 4 years, 11 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 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 { 1482 {
1483 # GN: //base:base_multidex_gen 1483 # GN: //base:base_multidex_gen
1484 'target_name': 'base_multidex_gen', 1484 'target_name': 'base_multidex_gen',
1485 'type': 'none', 1485 'type': 'none',
1486 'sources': [ 1486 'sources': [
1487 'android/java/templates/ChromiumMultiDex.template', 1487 'android/java/templates/ChromiumMultiDex.template',
1488 ], 1488 ],
1489 'variables': { 1489 'variables': {
1490 'package_name': 'org/chromium/base/multidex', 1490 'package_name': 'org/chromium/base/multidex',
1491 'template_deps': [], 1491 'template_deps': [],
1492 'additional_gcc_preprocess_options': [
1493 '--defines', 'MULTIDEX_CONFIGURATION_<(CONFIGURATION_NAME)',
1494 ],
1495 }, 1492 },
1496 'includes': ['../build/android/java_cpp_template.gypi'], 1493 'includes': ['../build/android/java_cpp_template.gypi'],
1497 }, 1494 },
1498 { 1495 {
1499 # GN: //base:base_android_java_enums_srcjar 1496 # GN: //base:base_android_java_enums_srcjar
1500 'target_name': 'base_java_library_process_type', 1497 'target_name': 'base_java_library_process_type',
1501 'type': 'none', 1498 'type': 'none',
1502 'variables': { 1499 'variables': {
1503 'source_file': 'android/library_loader/library_loader_hooks.h', 1500 'source_file': 'android/library_loader/library_loader_hooks.h',
1504 }, 1501 },
1505 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1502 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1506 }, 1503 },
1507 { 1504 {
1508 # GN: //base:base_java 1505 # GN: //base:base_java
1509 'target_name': 'base_java', 1506 'target_name': 'base_java',
1510 'type': 'none', 1507 'type': 'none',
1511 'variables': { 1508 'variables': {
1512 'java_in_dir': 'android/java', 1509 'java_in_dir': 'android/java',
1513 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1510 'jar_excluded_classes': [
1511 '*/ChromiumMultiDex.class',
1512 '*/NativeLibraries.class',
1513 ],
1514 }, 1514 },
1515 'dependencies': [ 1515 'dependencies': [
1516 'base_java_application_state', 1516 'base_java_application_state',
1517 'base_java_library_load_from_apk_status_codes', 1517 'base_java_library_load_from_apk_status_codes',
1518 'base_java_library_process_type', 1518 'base_java_library_process_type',
1519 'base_java_memory_pressure_level', 1519 'base_java_memory_pressure_level',
1520 'base_multidex_gen', 1520 'base_multidex_gen',
1521 'base_native_libraries_gen', 1521 'base_native_libraries_gen',
1522 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib', 1522 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1523 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1523 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1524 ], 1524 ],
1525 'all_dependent_settings': {
1526 'variables': {
1527 'generate_multidex_config': 1,
1528 },
1529 },
1525 'includes': [ '../build/java.gypi' ], 1530 'includes': [ '../build/java.gypi' ],
1526 }, 1531 },
1527 { 1532 {
1528 # GN: //base:base_java_unittest_support 1533 # GN: //base:base_java_unittest_support
1529 'target_name': 'base_java_unittest_support', 1534 'target_name': 'base_java_unittest_support',
1530 'type': 'none', 1535 'type': 'none',
1531 'dependencies': [ 1536 'dependencies': [
1532 'base_java', 1537 'base_java',
1533 ], 1538 ],
1534 'variables': { 1539 'variables': {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 }, 1581 },
1577 'includes': [ '../build/java.gypi' ], 1582 'includes': [ '../build/java.gypi' ],
1578 }, 1583 },
1579 { 1584 {
1580 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l 1585 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l
1581 # in the multidex shadow library. crbug.com/522043 1586 # in the multidex shadow library. crbug.com/522043
1582 # GN: //base:base_junit_test_support 1587 # GN: //base:base_junit_test_support
1583 'target_name': 'base_junit_test_support', 1588 'target_name': 'base_junit_test_support',
1584 'type': 'none', 1589 'type': 'none',
1585 'dependencies': [ 1590 'dependencies': [
1591 'base_multidex_gen',
1586 '../testing/android/junit/junit_test.gyp:junit_test_support', 1592 '../testing/android/junit/junit_test.gyp:junit_test_support',
1587 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib', 1593 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1588 ], 1594 ],
1589 'variables': { 1595 'variables': {
1590 'src_paths': [ 1596 'src_paths': [
1591 '../base/test/android/junit/src/org/chromium/base/test/shadows/Sha dowMultiDex.java', 1597 '../base/test/android/junit/src/org/chromium/base/test/shadows/Sha dowMultiDex.java',
1592 ], 1598 ],
1593 }, 1599 },
1594 'includes': [ '../build/host_jar.gypi' ] 1600 'includes': [ '../build/host_jar.gypi' ]
1595 }, 1601 },
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1736 '../build/isolate.gypi', 1742 '../build/isolate.gypi',
1737 ], 1743 ],
1738 'sources': [ 1744 'sources': [
1739 'base_unittests.isolate', 1745 'base_unittests.isolate',
1740 ], 1746 ],
1741 }, 1747 },
1742 ], 1748 ],
1743 }], 1749 }],
1744 ], 1750 ],
1745 } 1751 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698