diff options
| author |  ajmichael <ajmichael@google.com> | 2017-08-23 04:00:22 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-23 13:31:41 +0200 |
| commit | 30fd060da6d7bd894e158e63ecca0fdfce0a9e81 (patch) | |
| tree | 6e307df13692ed0e603ea62a0b0e8df9cd0aea77 | |
| parent | ff1bdb02e5a32983295c713f0ce9fba60142996e (diff) | |
RELNOTES: Allow java_lite_proto_library in the deps of android rules.
PiperOrigin-RevId: 166147064
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 5 |
1 files changed, 3 insertions, 2 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 9f4cbfcc09..ff0f01468b 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 @@ -321,9 +321,10 @@ public final class AndroidRuleClasses { "cc_library", "java_import", "java_library", + "java_lite_proto_library", }; - public static final boolean hasProguardSpecs(AttributeMap rule) { + public static boolean hasProguardSpecs(AttributeMap rule) { // 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 // have the ability to know the configuration when determining implicit outputs). @@ -949,7 +950,7 @@ public final class AndroidRuleClasses { /** * Semantic options for the dexer's multidex behavior. */ - public static enum MultidexMode { + public enum MultidexMode { // Build dexes with multidex, assuming native platform support for multidex. NATIVE, // Build dexes with multidex and implement support at the application level. |