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

Side by Side Diff: base/base.gyp

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-op ChromiumMultiDex.install for non-multidex builds Created 5 years, 1 month 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 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 'variables': { 1447 'variables': {
1448 'source_file': 'android/library_loader/library_loader_hooks.h', 1448 'source_file': 'android/library_loader/library_loader_hooks.h',
1449 }, 1449 },
1450 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1450 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1451 }, 1451 },
1452 { 1452 {
1453 # GN: //base:base_java 1453 # GN: //base:base_java
1454 'target_name': 'base_java', 1454 'target_name': 'base_java',
1455 'type': 'none', 1455 'type': 'none',
1456 'variables': { 1456 'variables': {
1457 'input_jars_paths': ['>@(multidex_disabled_jars_paths)'],
1457 'java_in_dir': 'android/java', 1458 'java_in_dir': 'android/java',
1458 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1459 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1459 }, 1460 },
1460 'dependencies': [ 1461 'dependencies': [
1461 'base_java_application_state', 1462 'base_java_application_state',
1462 'base_java_library_load_from_apk_status_codes', 1463 'base_java_library_load_from_apk_status_codes',
1463 'base_java_library_process_type', 1464 'base_java_library_process_type',
1464 'base_java_memory_pressure_level', 1465 'base_java_memory_pressure_level',
1466 'base_multidex_disabled_java',
1465 'base_native_libraries_gen', 1467 'base_native_libraries_gen',
1466 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1467 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1468 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1468 ], 1469 ],
1469 'includes': [ '../build/java.gypi' ], 1470 'includes': [ '../build/java.gypi' ],
1470 }, 1471 },
1471 { 1472 {
1473 # GN: TODO(jbudorick): Enable this target in GN when adding GN
1474 # multidex support.
1475 'target_name': 'base_multidex_enabled_java',
agrieve 2015/11/11 14:43:01 Curious why you made these into separate targets i
jbudorick 2015/11/12 20:33:40 these two targets are gone after implementing Yaro
1476 'type': 'none',
1477 'variables': {
1478 'add_to_dependents_classpaths': 0,
1479 'java_in_dir': 'android/multidex/java_enabled',
1480 },
1481 'dependencies': [
1482 'base_java',
1483 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1484 ],
1485 'all_dependent_settings': {
1486 'variables': {
1487 'multidex_enabled_jars_paths': [
1488 '<(PRODUCT_DIR)/lib.java/base_multidex_enabled_java.jar',
1489 ],
1490 },
1491 },
1492 'includes': [ '../build/java.gypi' ],
1493 },
1494 {
1495 # GN: TODO(jbudorick): Enable this target in GN when adding GN
1496 # multidex support.
1497 'target_name': 'base_multidex_disabled_java',
1498 'type': 'none',
1499 'variables': {
1500 'add_to_dependents_classpaths': 0,
1501 'java_in_dir': 'android/multidex/java_disabled',
1502 },
1503 'dependencies': [],
1504 'all_dependent_settings': {
1505 'variables': {
1506 'multidex_disabled_jars_paths': [
1507 '<(PRODUCT_DIR)/lib.java/base_multidex_disabled_java.jar'
1508 ],
1509 },
1510 },
1511 'includes': [ '../build/java.gypi' ],
1512 },
1513 {
1472 # GN: //base:base_java_unittest_support 1514 # GN: //base:base_java_unittest_support
1473 'target_name': 'base_java_unittest_support', 1515 'target_name': 'base_java_unittest_support',
1474 'type': 'none', 1516 'type': 'none',
1475 'dependencies': [ 1517 'dependencies': [
1476 'base_java', 1518 'base_java',
1477 ], 1519 ],
1478 'variables': { 1520 'variables': {
1479 'java_in_dir': '../base/test/android/java', 1521 'java_in_dir': '../base/test/android/java',
1480 }, 1522 },
1481 'includes': [ '../build/java.gypi' ], 1523 'includes': [ '../build/java.gypi' ],
(...skipping 24 matching lines...) Expand all
1506 'source_file': 'memory/memory_pressure_listener.h', 1548 'source_file': 'memory/memory_pressure_listener.h',
1507 }, 1549 },
1508 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1550 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1509 }, 1551 },
1510 { 1552 {
1511 # GN: //base:base_java_test_support 1553 # GN: //base:base_java_test_support
1512 'target_name': 'base_java_test_support', 1554 'target_name': 'base_java_test_support',
1513 'type': 'none', 1555 'type': 'none',
1514 'dependencies': [ 1556 'dependencies': [
1515 'base_java', 1557 'base_java',
1558 'base_multidex_disabled_java',
1516 '../testing/android/on_device_instrumentation.gyp:reporter_java', 1559 '../testing/android/on_device_instrumentation.gyp:reporter_java',
1517 ], 1560 ],
1518 'variables': { 1561 'variables': {
1562 'input_jars_paths': ['>@(multidex_disabled_jars_paths)'],
1519 'java_in_dir': '../base/test/android/javatests', 1563 'java_in_dir': '../base/test/android/javatests',
1520 }, 1564 },
1521 'includes': [ '../build/java.gypi' ], 1565 'includes': [ '../build/java.gypi' ],
1522 }, 1566 },
1523 { 1567 {
1524 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l 1568 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l
1525 # in the multidex shadow library. crbug.com/522043 1569 # in the multidex shadow library. crbug.com/522043
1526 # GN: //base:base_junit_test_support 1570 # GN: //base:base_junit_test_support
1527 'target_name': 'base_junit_test_support', 1571 'target_name': 'base_junit_test_support',
1528 'type': 'none', 1572 'type': 'none',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 '../build/isolate.gypi', 1723 '../build/isolate.gypi',
1680 ], 1724 ],
1681 'sources': [ 1725 'sources': [
1682 'base_unittests.isolate', 1726 'base_unittests.isolate',
1683 ], 1727 ],
1684 }, 1728 },
1685 ], 1729 ],
1686 }], 1730 }],
1687 ], 1731 ],
1688 } 1732 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698