diff options
3 files changed, 10 insertions, 3 deletions
diff --git a/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java b/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java index f04b381..5691d47 100644 --- a/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java +++ b/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java @@ -73,7 +73,11 @@ public class FakeAndroidTarget implements IAndroidTarget { return Integer.parseInt(target.substring("android-".length())); } - return -1; + // We don't actually know the API level at this point since the mode is "current" + // or "unstubbed". This API is only called to check if annotations.jar needs to be + // added to the classpath, so by putting a large value we make sure annotations.jar + // isn't used. + return 99; } @Override diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy index 40e46f2..3bc85db 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -949,7 +949,7 @@ public abstract class BasePlugin { VariantConfiguration variantConfig = variantData.variantConfiguration - Closure libraryClosure = { project.files({ variantConfig.packagedJars }) } + Closure libraryClosure = { project.files(variantConfig.packagedJars) } Closure sourceClosure = { variantData.javaCompileTask.outputs.files } Closure proguardFileClosure = { } diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy index 8b9eed0..7f4851e 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy @@ -28,7 +28,7 @@ import com.google.common.collect.Lists public class BuildTypeDsl extends DefaultBuildType implements Serializable { private static final long serialVersionUID = 1L - private List<Object> proguardFiles = Lists.newArrayList(); + private final List<Object> proguardFiles = Lists.newArrayList(); BuildTypeDsl(@NonNull String name) { super(name) @@ -57,6 +57,9 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable { setZipAlign(that.isZipAlign()) setSigningConfig(that.getSigningConfig()) + proguardFiles.clear(); + proguardFiles.addAll(that.proguardFiles); + return this; } |