diff options
| author |  cparsons <cparsons@google.com> | 2017-11-01 11:26:16 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-11-02 10:02:54 -0400 |
| commit | 64878508ca2e8c104e281e885890359b18899c80 (patch) | |
| tree | 9af402b67b8481502b24b786707297b9090edeb4 /src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java | |
| parent | 89d954c1d8bc072268fb7ef79da5eb4135ce5d2f (diff) | |
Automated rollback of commit 02a5b0fe11de1abe1c6f124413b847f0ecf6c4dd.
*** Reason for rollback ***
Breaks Blaze nightly
Example failing test: []
*** Original change description ***
Allow android_test to properly inherit resources
RELNOTES: none
PiperOrigin-RevId: 174182803
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainer.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 ce218c3236..f97812665a 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 @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.android; import com.google.auto.value.AutoValue; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; @@ -73,8 +72,7 @@ public abstract class ResourceContainer { abstract ImmutableList<Artifact> getAssets(); - @VisibleForTesting - public abstract ImmutableList<Artifact> getResources(); + abstract ImmutableList<Artifact> getResources(); public ImmutableList<Artifact> getArtifacts(ResourceType resourceType) { return resourceType == ResourceType.ASSETS ? getAssets() : getResources(); |