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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/android/java/templates/NativeLibraries.template » ('j') | net/net.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index aabfe67879f3e3a8656f91ff0025e458ff2bdcf4..c0b0816d69df24bd3cdf1ab0758bb03aabea0cba 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1684,7 +1684,13 @@ if (is_android) {
":base_java",
"//testing/android/reporter:reporter_java",
]
+ srcjar_deps = [ ":base_native_test_libraries_gen" ]
DEPRECATED_java_in_dir = "test/android/javatests/src"
+
+ jar_excluded_patterns = [
+ "*/NativeTestLibraries.class",
+ "*/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
+ ]
}
# TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull
@@ -1745,6 +1751,14 @@ if (is_android) {
package_name = "org/chromium/base/library_loader"
}
+ # GYP: //base/base.gyp:base_native_test_libraries_gen
+ java_cpp_template("base_native_test_libraries_gen") {
+ sources = [
+ "test/android/java/templates/NativeTestLibraries.template",
+ ]
+ package_name = "org/chromium/base/test/library_loader"
+ }
+
# GYP: //base.gyp:base_java_unittest_support
android_library("base_java_unittest_support") {
deps = [
« 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