Commit e36bef93 authored by Paul Jensen's avatar Paul Jensen Committed by Commit Bot

[Cronet] Add gradle test for Cronet fallback Maven module

Also add missing dependency for fallback impl.

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I8c568bb1bc10cb0aac3df0588e93840bcb05b2bf
Reviewed-on: https://chromium-review.googlesource.com/1047370Reviewed-by: default avatarAndrei Kapishnikov <kapishnikov@chromium.org>
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556477}
parent 14680323
...@@ -1609,13 +1609,22 @@ copy("cronet_maven_test_copy") { ...@@ -1609,13 +1609,22 @@ copy("cronet_maven_test_copy") {
] ]
} }
process_version("cronet_maven_build_copy") { process_version("cronet_maven_build_embedded_copy") {
template_file = "maven/test/build.gradle.template" template_file = "maven/test/build_embedded.gradle.template"
sources = [ sources = [
"//build/util/LASTCHANGE", "//build/util/LASTCHANGE",
"//chrome/VERSION", "//chrome/VERSION",
] ]
output = "$_maven_test_dir/app/build.gradle" output = "$_maven_test_dir/test_embedded/build.gradle"
}
process_version("cronet_maven_build_fallback_copy") {
template_file = "maven/test/build_fallback.gradle.template"
sources = [
"//build/util/LASTCHANGE",
"//chrome/VERSION",
]
output = "$_maven_test_dir/test_fallback/build.gradle"
} }
if (use_platform_icu_alternatives) { if (use_platform_icu_alternatives) {
...@@ -1623,10 +1632,9 @@ if (use_platform_icu_alternatives) { ...@@ -1623,10 +1632,9 @@ if (use_platform_icu_alternatives) {
script = "maven/test/build_with_gradle.py" script = "maven/test/build_with_gradle.py"
depfile = "$target_gen_dir/$target_name.d" depfile = "$target_gen_dir/$target_name.d"
deps = [ deps = [
":cronet_maven_api_module", ":cronet_maven_build_embedded_copy",
":cronet_maven_build_copy", ":cronet_maven_build_fallback_copy",
":cronet_maven_impl_common_module", ":cronet_maven_modules",
":cronet_maven_impl_native_module",
":cronet_maven_test_copy", ":cronet_maven_test_copy",
# These deps ensure all source files of the sample app are deps. # These deps ensure all source files of the sample app are deps.
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
<artifactId>cronet-common</artifactId> <artifactId>cronet-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies> </dependencies>
<licenses> <licenses>
<license> <license>
......
include ':app' include ':test_embedded'
include ':test_fallback'
apply plugin: 'com.android.application'
android {
compileSdkVersion 26
def cronet_dir = "../../../../../../components/cronet/android"
buildTypes {
release {
minifyEnabled true
testProguardFiles "$cronet_dir/maven/test/proguard.cfg"
}
debug {
minifyEnabled true
testProguardFiles "$cronet_dir/maven/test/proguard.cfg"
}
}
// Cronet jars contain Java 8 bytecodes.
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
defaultConfig {
applicationId "org.chromium.cronet_sample_apk"
minSdkVersion 16
targetSdkVersion 23
versionCode 1
versionName "1.0"
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
}
sourceSets {
main {
manifest.srcFile "$cronet_dir/sample/AndroidManifest.xml"
java.srcDirs = [ "$cronet_dir/sample/src" ]
res.srcDirs = [ "$cronet_dir/sample/res" ]
}
androidTest {
manifest.srcFile "$cronet_dir/sample/javatests/AndroidManifest.xml"
java.srcDirs = [ "$cronet_dir/sample/javatests/src" ]
}
}
}
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
maven {
url '../..'
}
}
dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
implementation 'com.android.support:appcompat-v7:25.4.0'
implementation 'org.chromium.net:cronet-fallback:@MAJOR@.@BUILD@.@PATCH@'
androidTestUtil 'com.android.support.test:orchestrator:1.0.1'
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment