commit 6f35d33c47f1a2fdbde31221883c0906c7bab800
author asteinb <asteinb@google.com> Mon May 07 12:34:59 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon May 07 12:36:13 2018 -0700
tree b6941f3632cc78f2b300084be009c084569fafd8
parent 1ad8a8815e5d0f646f12fbcb2ec53a79fb8dcb79

Do not expose ResourceContainer to Skylark

There are a bunch of reasons this shouldn't be exposed:

- ResourceContainer is a glob of several unrelated bits of functionality
- We are working on getting rid of ResourceContainer in favor of things like
  AndroidResources
- We should pass information between targets using providers, not internal
  state like ResourceContainer

RELNOTES: none
PiperOrigin-RevId: 195704044

src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java
index 254a1d0..a4972d2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java
@@ -25,9 +25,6 @@
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.packages.RuleErrorConsumer;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.Objects;
@@ -37,11 +34,6 @@
 /** The resources contributed by a single target. */
 @AutoValue
 @Immutable
-@SkylarkModule(
-  name = "resource_container",
-  category = SkylarkModuleCategory.NONE,
-  doc = "The Android resources contributed by a single target."
-)
 public abstract class ResourceContainer implements ValidatedAndroidData {
   /** The type of resource in question: either asset or a resource. */
   public enum ResourceType {
@@ -59,7 +51,6 @@
     }
   }
 
-  @SkylarkCallable(name = "label", doc = "Returns the label for this target.", structField = true)
   public abstract Label getLabel();
 
   @Nullable
@@ -74,11 +65,6 @@
     return new ProcessedAndroidManifest(getManifest(), getJavaPackage(), isManifestExported());
   }
 
-  @SkylarkCallable(
-    name = "manifest",
-    doc = "Returns the manifest for the target.",
-    structField = true
-  )
   @Override
   public abstract Artifact getManifest();
 
@@ -150,30 +136,12 @@
   public abstract Artifact getSymbols();
 
   @Nullable
-  @SkylarkCallable(
-    name = "compiled_symbols",
-    doc = "Returns the compiled symbols generated by aapt2.",
-    allowReturnNones = true,
-    structField = true
-  )
   public abstract Artifact getCompiledSymbols();
 
   @Nullable
-  @SkylarkCallable(
-    name = "static_library",
-    doc = "Returns the static library created by aapt2.",
-    allowReturnNones = true,
-    structField = true
-  )
   public abstract Artifact getStaticLibrary();
 
   @Nullable
-  @SkylarkCallable(
-    name = "aapt2_r_txt",
-    doc = "Returns the R.txt generated by aapt2.",
-    allowReturnNones = true,
-    structField = true
-  )
   public abstract Artifact getAapt2RTxt();
 
   @Nullable