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

Side by Side Diff: base/base.gyp

Issue 1526183002: Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 'variables': { 1488 'variables': {
1489 'package_name': 'org/chromium/base/multidex', 1489 'package_name': 'org/chromium/base/multidex',
1490 'template_deps': [], 1490 'template_deps': [],
1491 'additional_gcc_preprocess_options': [ 1491 'additional_gcc_preprocess_options': [
1492 '--defines', 'MULTIDEX_CONFIGURATION_<(CONFIGURATION_NAME)', 1492 '--defines', 'MULTIDEX_CONFIGURATION_<(CONFIGURATION_NAME)',
1493 ], 1493 ],
1494 }, 1494 },
1495 'includes': ['../build/android/java_cpp_template.gypi'], 1495 'includes': ['../build/android/java_cpp_template.gypi'],
1496 }, 1496 },
1497 { 1497 {
1498 # GN: //base:base_native_test_libraries_gen
1499 'target_name': 'base_native_test_libraries_gen',
1500 'type': 'none',
1501 'sources': [
1502 'test/android/java/templates/NativeTestLibraries.template',
1503 ],
1504 'variables': {
1505 'package_name': 'org/chromium/base/test/library_loader',
1506 'template_deps': [],
1507 },
1508 'includes': [ '../build/android/java_cpp_template.gypi' ],
1509 },
1510 {
1511 # GN: //base:base_android_java_enums_srcjar 1498 # GN: //base:base_android_java_enums_srcjar
1512 'target_name': 'base_java_library_process_type', 1499 'target_name': 'base_java_library_process_type',
1513 'type': 'none', 1500 'type': 'none',
1514 'variables': { 1501 'variables': {
1515 'source_file': 'android/library_loader/library_loader_hooks.h', 1502 'source_file': 'android/library_loader/library_loader_hooks.h',
1516 }, 1503 },
1517 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1504 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1518 }, 1505 },
1519 { 1506 {
1520 # GN: //base:base_java 1507 # GN: //base:base_java
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 'source_file': 'memory/memory_pressure_listener.h', 1561 'source_file': 'memory/memory_pressure_listener.h',
1575 }, 1562 },
1576 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1563 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1577 }, 1564 },
1578 { 1565 {
1579 # GN: //base:base_java_test_support 1566 # GN: //base:base_java_test_support
1580 'target_name': 'base_java_test_support', 1567 'target_name': 'base_java_test_support',
1581 'type': 'none', 1568 'type': 'none',
1582 'dependencies': [ 1569 'dependencies': [
1583 'base_java', 1570 'base_java',
1584 'base_native_test_libraries_gen',
1585 '../testing/android/on_device_instrumentation.gyp:reporter_java', 1571 '../testing/android/on_device_instrumentation.gyp:reporter_java',
1586 ], 1572 ],
1587 'variables': { 1573 'variables': {
1588 'jar_excluded_classes': [ '*/NativeTestLibraries.class' ],
1589 'java_in_dir': '../base/test/android/javatests', 1574 'java_in_dir': '../base/test/android/javatests',
1590 }, 1575 },
1591 'includes': [ '../build/java.gypi' ], 1576 'includes': [ '../build/java.gypi' ],
1592 }, 1577 },
1593 { 1578 {
1594 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l 1579 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pul l
1595 # in the multidex shadow library. crbug.com/522043 1580 # in the multidex shadow library. crbug.com/522043
1596 # GN: //base:base_junit_test_support 1581 # GN: //base:base_junit_test_support
1597 'target_name': 'base_junit_test_support', 1582 'target_name': 'base_junit_test_support',
1598 'type': 'none', 1583 'type': 'none',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 '../build/isolate.gypi', 1734 '../build/isolate.gypi',
1750 ], 1735 ],
1751 'sources': [ 1736 'sources': [
1752 'base_unittests.isolate', 1737 'base_unittests.isolate',
1753 ], 1738 ],
1754 }, 1739 },
1755 ], 1740 ],
1756 }], 1741 }],
1757 ], 1742 ],
1758 } 1743 }
OLDNEW
« no previous file with comments | « base/android/java/templates/NativeLibraries.template ('k') | base/test/android/java/templates/NativeTestLibraries.template » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698