Make default value of exports_manifest depend on a flag.

RELNOTES: None
PiperOrigin-RevId: 155321388

1 files changed, 10 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
index a8a589bc6c..1badc11f0d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
@@ -17,6 +17,7 @@ import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTran
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
+import static com.google.devtools.build.lib.packages.BuildType.TRISTATE;
 import static com.google.devtools.build.lib.syntax.Type.BOOLEAN;
 import static com.google.devtools.build.lib.syntax.Type.STRING;
 
@@ -24,6 +25,7 @@ import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
+import com.google.devtools.build.lib.packages.TriState;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidAaptBaseRule;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidBaseRule;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidResourceSupportRule;
@@ -78,9 +80,9 @@ public final class AndroidLibraryBaseRule implements RuleDefinition {
         for the Android target platform.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .override(builder.copy("deps")
-            .allowedRuleClasses(AndroidRuleClasses.ALLOWED_DEPENDENCIES)
-            .allowedFileTypes()
-            .aspect(androidNeverlinkAspect))
+                .allowedRuleClasses(AndroidRuleClasses.ALLOWED_DEPENDENCIES)
+                .allowedFileTypes()
+                .aspect(androidNeverlinkAspect))
         /* <!-- #BLAZE_RULE(android_library).ATTRIBUTE(exports) -->
         The closure of all rules reached via <code>exports</code> attributes
         are considered direct dependencies of any rule that directly depends on the
@@ -89,13 +91,13 @@ public final class AndroidLibraryBaseRule implements RuleDefinition {
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("exports", LABEL_LIST)
             .allowedRuleClasses(AndroidRuleClasses.ALLOWED_DEPENDENCIES)
-            .allowedFileTypes(/*May not have files in exports!*/)
+            .allowedFileTypes(/*May not have files in exports!*/ )
             .aspect(androidNeverlinkAspect))
         /* <!-- #BLAZE_RULE(android_library).ATTRIBUTE(exports_manifest) -->
         Whether to export manifest entries to <code>android_binary</code> targets
         that depend on this target. <code>uses-permissions</code> attributes are never exported.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
-        .add(attr("exports_manifest", BOOLEAN).value(false))
+        .add(attr("exports_manifest", TRISTATE).value(TriState.AUTO))
         /* <!-- #BLAZE_RULE(android_library).ATTRIBUTE(exported_plugins) -->
         The list of <code><a href="#${link java_plugin}">java_plugin</a></code>s (e.g. annotation
         processors) to export to libraries that directly depend on this library.
@@ -106,7 +108,7 @@ public final class AndroidLibraryBaseRule implements RuleDefinition {
         </p>
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("exported_plugins", LABEL_LIST).cfg(HOST).allowedRuleClasses("java_plugin")
-            .allowedFileTypes(FileTypeSet.NO_FILE))
+                .allowedFileTypes(FileTypeSet.NO_FILE))
         .add(attr("alwayslink", BOOLEAN).undocumented("purely informational for now"))
         /* <!-- #BLAZE_RULE(android_library).ATTRIBUTE(neverlink) -->
         Only use this library for compilation and not at runtime.
@@ -156,7 +158,8 @@ public final class AndroidLibraryBaseRule implements RuleDefinition {
         See <a href="${link android_library.idl_import_root}">the description of idl_import_root</a>
         for information about what this means.</p>
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
-        .add(attr("idl_parcelables", LABEL_LIST).direct_compile_time_input()
+        .add(attr("idl_parcelables", LABEL_LIST)
+            .direct_compile_time_input()
             .allowedFileTypes(AndroidRuleClasses.ANDROID_IDL))
         .add(attr("$android_manifest_merge_tool", LABEL).cfg(HOST).exec().value(
             env.getToolsLabel(AndroidRuleClasses.MANIFEST_MERGE_TOOL_LABEL)))