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

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: agrieve 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
« no previous file with comments | « no previous file | base/android/java/templates/NativeLibraries.template » ('j') | net/net.gyp » ('J')
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 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 ] 1677 ]
1678 DEPRECATED_java_in_dir = "android/javatests/src" 1678 DEPRECATED_java_in_dir = "android/javatests/src"
1679 } 1679 }
1680 1680
1681 # GYP: //base.gyp:base_java_test_support 1681 # GYP: //base.gyp:base_java_test_support
1682 android_library("base_java_test_support") { 1682 android_library("base_java_test_support") {
1683 deps = [ 1683 deps = [
1684 ":base_java", 1684 ":base_java",
1685 "//testing/android/reporter:reporter_java", 1685 "//testing/android/reporter:reporter_java",
1686 ] 1686 ]
1687 srcjar_deps = [ ":base_native_test_libraries_gen" ]
1687 DEPRECATED_java_in_dir = "test/android/javatests/src" 1688 DEPRECATED_java_in_dir = "test/android/javatests/src"
1689
1690 jar_excluded_patterns = [
1691 "*/NativeTestLibraries.class",
1692 "*/NativeTestLibraries##*.class",
Yaron 2015/11/24 19:06:28 Why isn't this needed for gyp?
jbudorick 2015/11/25 02:43:40 I don't think this is needed for GN any more. Remo
1693 ]
1688 } 1694 }
1689 1695
1690 # 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
1691 # in the multidex shadow library. crbug.com/522043 1697 # in the multidex shadow library. crbug.com/522043
1692 # GYP: //base.gyp:base_junit_test_support 1698 # GYP: //base.gyp:base_junit_test_support
1693 java_library("base_junit_test_support") { 1699 java_library("base_junit_test_support") {
1694 testonly = true 1700 testonly = true
1695 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" ]
1696 deps = [ 1702 deps = [
1697 "//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
1738 } 1744 }
1739 1745
1740 # GYP: //base/base.gyp:base_native_libraries_gen 1746 # GYP: //base/base.gyp:base_native_libraries_gen
1741 java_cpp_template("base_native_libraries_gen") { 1747 java_cpp_template("base_native_libraries_gen") {
1742 sources = [ 1748 sources = [
1743 "android/java/templates/NativeLibraries.template", 1749 "android/java/templates/NativeLibraries.template",
1744 ] 1750 ]
1745 package_name = "org/chromium/base/library_loader" 1751 package_name = "org/chromium/base/library_loader"
1746 } 1752 }
1747 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
1748 # GYP: //base.gyp:base_java_unittest_support 1762 # GYP: //base.gyp:base_java_unittest_support
1749 android_library("base_java_unittest_support") { 1763 android_library("base_java_unittest_support") {
1750 deps = [ 1764 deps = [
1751 ":base_java", 1765 ":base_java",
1752 ] 1766 ]
1753 java_files = 1767 java_files =
1754 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1768 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1755 } 1769 }
1756 } 1770 }
OLDNEW
« no previous file with comments | « no previous file | base/android/java/templates/NativeLibraries.template » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698