diff options
| author |  Googler <noreply@google.com> | 2015-09-24 00:21:04 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-09-24 14:21:05 +0000 |
| commit | 402d112bc25449f1e690bbbace600bbcda834d24 (patch) | |
| tree | 7ab138fa656c0ce80cd8fd9171891dfb7563f687 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | |
| parent | 93cb6466b928eb4abd1f0bd050619a31d3752f68 (diff) | |
Rollback of commit 53330510c6ea5cd6257b9981b44e52d15a9e01aa.
*** Reason for rollback ***
Breaks tests.
*** Original change description ***
Remove gen jar implicit output.
This allows us to only create a jar for libraries that use annotation processing.
It also increases our flexibility by reducing the visibility of these gen jars
to an undocumented output group.
--
MOS_MIGRATED_REVID=103800137
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index c7989d3213..2b80cb1b7a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -66,6 +66,8 @@ public final class AndroidRuleClasses { JavaSemantics.JAVA_LIBRARY_SOURCE_JAR; public static final SafeImplicitOutputsFunction ANDROID_LIBRARY_CLASS_JAR = JavaSemantics.JAVA_LIBRARY_CLASS_JAR; + public static final SafeImplicitOutputsFunction ANDROID_LIBRARY_GEN_JAR = + JavaSemantics.JAVA_LIBRARY_GEN_JAR; public static final SafeImplicitOutputsFunction ANDROID_LIBRARY_JACK_FILE = fromTemplates("lib%{name}.jack"); public static final SafeImplicitOutputsFunction ANDROID_LIBRARY_AAR = @@ -84,6 +86,8 @@ public final class AndroidRuleClasses { fromTemplates("%{name}_unsigned.apk"); public static final SafeImplicitOutputsFunction ANDROID_BINARY_SIGNED_APK = fromTemplates("%{name}_signed.apk"); + public static final SafeImplicitOutputsFunction ANDROID_BINARY_GEN_JAR = + JavaSemantics.JAVA_BINARY_GEN_JAR; public static final SafeImplicitOutputsFunction ANDROID_BINARY_DEPLOY_JAR = fromTemplates("%{name}_deploy.jar"); public static final SafeImplicitOutputsFunction ANDROID_BINARY_PROGUARD_JAR = @@ -244,6 +248,7 @@ public final class AndroidRuleClasses { functions.add(AndroidRuleClasses.ANDROID_BINARY_APK); functions.add(AndroidRuleClasses.ANDROID_BINARY_UNSIGNED_APK); functions.add(AndroidRuleClasses.ANDROID_BINARY_DEPLOY_JAR); + functions.add(AndroidRuleClasses.ANDROID_BINARY_GEN_JAR); // The below is a hack to support configurable attributes (proguard_specs seems like // too valuable an attribute to make nonconfigurable, and we don't currently @@ -286,6 +291,7 @@ public final class AndroidRuleClasses { implicitOutputs.add( AndroidRuleClasses.ANDROID_LIBRARY_CLASS_JAR, + AndroidRuleClasses.ANDROID_LIBRARY_GEN_JAR, AndroidRuleClasses.ANDROID_LIBRARY_SOURCE_JAR, AndroidRuleClasses.ANDROID_LIBRARY_JACK_FILE, AndroidRuleClasses.ANDROID_LIBRARY_AAR); |