diff options
| author |  asteinb <asteinb@google.com> | 2018-04-02 11:39:48 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-02 11:41:03 -0700 |
| commit | 7efeb1bd273a44ebe3c909e9d05157ceed2765e8 (patch) | |
| tree | 061cc889500c51ecb9b15259d56aa5ad45259eaa /src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java | |
| parent | fe7bb5ea10adae6a5b61681fc48927bb365c8a24 (diff) | |
Automated rollback of commit 9bfbefc13f2b6ae9a86fd46a8470e3b4cd8efd1a.
*** Reason for rollback ***
Roll forward with fix and test - turns out I didn't distinguish properly
between list and item seperators.
*** Original change description ***
Rollback "Allow Merge action to take an interface as primary, not just ResourceContainer", as it breaks some android rule integration tests.
RELNOTES: none
PiperOrigin-RevId: 191322706
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java index 102abfc0c2..df15063d50 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceContainerConverter.java @@ -35,8 +35,11 @@ import java.util.function.Consumer; * Factory for functions to convert a {@link ResourceContainer} to a commandline argument, or a * collection of artifacts. Uses a certain convention for commandline arguments (e.g., separators, * and ordering of container elements). + * + * @deprecated Use {@link AndroidDataConverter} instead. */ @VisibleForTesting +@Deprecated public class ResourceContainerConverter { static Builder builder() { |