aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2014-04-30 22:54:01 -0700
committerBrett Chabot <brettchabot@google.com>2014-04-30 22:54:01 -0700
commitcdf692b7b636331588f353be0f3103262c704d47 (patch)
treec0ca5e6db768dc2c4a30ef79daf77e4ec66343f9
parent77ea5df81c2226e5f94214baeb9887d228b2c6dc (diff)
downloadjunit-cdf692b7b636331588f353be0f3103262c704d47.tar.gz
Omit junit.runner and junit.textui from junit gradle build.
These packages are included in the system android.test.runner, and proguard complains if they are included in an apk. Bug: 14417748 Change-Id: I9f20a4e793f1dd015d1fb6cccf16c40197e501b7
-rw-r--r--build.gradle8
1 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index 82ca976..c47c46d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,10 @@ sourceSets {
srcDirs = ['src']
include 'org/**',
'junit/extensions/**',
- 'junit/runner/**',
- 'junit/textui/**',
+ // remove these packages since they are in android.test.runner
+ // and proguard complains if they are present
+ // 'junit/runner/**',
+ // 'junit/textui/**',
'junit/framework/ComparisonCompactor.java',
'junit/framework/JUnit4TestAdapterCache.java',
'junit/framework/JUnit4TestAdapter.java',
@@ -24,4 +26,4 @@ jar {
dependencies {
compile getAndroidPrebuilt('4')
compile project(':hamcrest')
-} \ No newline at end of file
+}