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

Side by Side Diff: base/BUILD.gn

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
« no previous file with comments | « no previous file | base/android/java/templates/NativeLibraries.template » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/nacl/config.gni") 6 import("//build/config/nacl/config.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 ] 1686 ]
1687 DEPRECATED_java_in_dir = "android/javatests/src" 1687 DEPRECATED_java_in_dir = "android/javatests/src"
1688 } 1688 }
1689 1689
1690 # GYP: //base.gyp:base_java_test_support 1690 # GYP: //base.gyp:base_java_test_support
1691 android_library("base_java_test_support") { 1691 android_library("base_java_test_support") {
1692 deps = [ 1692 deps = [
1693 ":base_java", 1693 ":base_java",
1694 "//testing/android/reporter:reporter_java", 1694 "//testing/android/reporter:reporter_java",
1695 ] 1695 ]
1696 srcjar_deps = [ ":base_native_test_libraries_gen" ]
1697 DEPRECATED_java_in_dir = "test/android/javatests/src" 1696 DEPRECATED_java_in_dir = "test/android/javatests/src"
1698
1699 jar_excluded_patterns = [ "*/NativeTestLibraries.class" ]
1700 } 1697 }
1701 1698
1702 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull 1699 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull
1703 # in the multidex shadow library. crbug.com/522043 1700 # in the multidex shadow library. crbug.com/522043
1704 # GYP: //base.gyp:base_junit_test_support 1701 # GYP: //base.gyp:base_junit_test_support
1705 java_library("base_junit_test_support") { 1702 java_library("base_junit_test_support") {
1706 testonly = true 1703 testonly = true
1707 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ] 1704 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ]
1708 deps = [ 1705 deps = [
1709 "//third_party/android_tools:android_support_multidex_java", 1706 "//third_party/android_tools:android_support_multidex_java",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 } 1747 }
1751 1748
1752 # GYP: //base/base.gyp:base_native_libraries_gen 1749 # GYP: //base/base.gyp:base_native_libraries_gen
1753 java_cpp_template("base_native_libraries_gen") { 1750 java_cpp_template("base_native_libraries_gen") {
1754 sources = [ 1751 sources = [
1755 "android/java/templates/NativeLibraries.template", 1752 "android/java/templates/NativeLibraries.template",
1756 ] 1753 ]
1757 package_name = "org/chromium/base/library_loader" 1754 package_name = "org/chromium/base/library_loader"
1758 } 1755 }
1759 1756
1760 # GYP: //base/base.gyp:base_native_test_libraries_gen
1761 java_cpp_template("base_native_test_libraries_gen") {
1762 sources = [
1763 "test/android/java/templates/NativeTestLibraries.template",
1764 ]
1765 package_name = "org/chromium/base/test/library_loader"
1766 }
1767
1768 # GYP: //base.gyp:base_java_unittest_support 1757 # GYP: //base.gyp:base_java_unittest_support
1769 android_library("base_java_unittest_support") { 1758 android_library("base_java_unittest_support") {
1770 deps = [ 1759 deps = [
1771 ":base_java", 1760 ":base_java",
1772 ] 1761 ]
1773 java_files = 1762 java_files =
1774 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1763 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1775 } 1764 }
1776 } 1765 }
OLDNEW
« no previous file with comments | « no previous file | base/android/java/templates/NativeLibraries.template » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698