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

Side by Side Diff: base/BUILD.gn

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yfriedman comments 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) 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 1669 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 ] 1680 ]
1681 DEPRECATED_java_in_dir = "android/javatests/src" 1681 DEPRECATED_java_in_dir = "android/javatests/src"
1682 } 1682 }
1683 1683
1684 # GYP: //base.gyp:base_java_test_support 1684 # GYP: //base.gyp:base_java_test_support
1685 android_library("base_java_test_support") { 1685 android_library("base_java_test_support") {
1686 deps = [ 1686 deps = [
1687 ":base_java", 1687 ":base_java",
1688 "//testing/android/reporter:reporter_java", 1688 "//testing/android/reporter:reporter_java",
1689 ] 1689 ]
1690 srcjar_deps = [ ":base_native_test_libraries_gen" ]
1690 DEPRECATED_java_in_dir = "test/android/javatests/src" 1691 DEPRECATED_java_in_dir = "test/android/javatests/src"
1692
1693 jar_excluded_patterns = [ "*/NativeTestLibraries.class" ]
1691 } 1694 }
1692 1695
1693 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull 1696 # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull
1694 # in the multidex shadow library. crbug.com/522043 1697 # in the multidex shadow library. crbug.com/522043
1695 # GYP: //base.gyp:base_junit_test_support 1698 # GYP: //base.gyp:base_junit_test_support
1696 java_library("base_junit_test_support") { 1699 java_library("base_junit_test_support") {
1697 testonly = true 1700 testonly = true
1698 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ] 1701 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ]
1699 deps = [ 1702 deps = [
1700 "//third_party/android_tools:android_support_multidex_java", 1703 "//third_party/android_tools:android_support_multidex_java",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 } 1744 }
1742 1745
1743 # GYP: //base/base.gyp:base_native_libraries_gen 1746 # GYP: //base/base.gyp:base_native_libraries_gen
1744 java_cpp_template("base_native_libraries_gen") { 1747 java_cpp_template("base_native_libraries_gen") {
1745 sources = [ 1748 sources = [
1746 "android/java/templates/NativeLibraries.template", 1749 "android/java/templates/NativeLibraries.template",
1747 ] 1750 ]
1748 package_name = "org/chromium/base/library_loader" 1751 package_name = "org/chromium/base/library_loader"
1749 } 1752 }
1750 1753
1754 # GYP: //base/base.gyp:base_native_test_libraries_gen
1755 java_cpp_template("base_native_test_libraries_gen") {
1756 sources = [
1757 "test/android/java/templates/NativeTestLibraries.template",
1758 ]
1759 package_name = "org/chromium/base/test/library_loader"
1760 }
1761
1751 # GYP: //base.gyp:base_java_unittest_support 1762 # GYP: //base.gyp:base_java_unittest_support
1752 android_library("base_java_unittest_support") { 1763 android_library("base_java_unittest_support") {
1753 deps = [ 1764 deps = [
1754 ":base_java", 1765 ":base_java",
1755 ] 1766 ]
1756 java_files = 1767 java_files =
1757 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1768 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1758 } 1769 }
1759 } 1770 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698