aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
diff options
context:
space:
mode:
authorGravatar asteinb <asteinb@google.com>2018-05-10 12:13:47 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-10 12:15:36 -0700
commit4f0051c61045bedab87253b1c8db61cd22926708 (patch)
tree28243f886ef1e7f0c3348b2d068fc73e374b8b23 /src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
parentb5cd7065aeb0370fb6c341bc2578315ca1c62297 (diff)
Expose aar_import data processing methods to Skylark
Because of the special nature of aar_import, I don't think it makes much sense to split up the different parts - you always get everything out of the AAR. RELNOTES: none PiperOrigin-RevId: 196152640
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
index 696643328f..ac5c19df2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
@@ -45,12 +45,6 @@ public class ParsedAndroidAssets extends AndroidAssets implements MergableAndroi
}
/** Merges these assets with assets from dependencies. */
- public MergedAndroidAssets merge(RuleContext ruleContext, boolean neverlink)
- throws InterruptedException {
- return MergedAndroidAssets.mergeFrom(
- ruleContext, this, AssetDependencies.fromRuleDeps(ruleContext, neverlink));
- }
-
MergedAndroidAssets merge(RuleContext ruleContext, AssetDependencies assetDeps)
throws InterruptedException {
return MergedAndroidAssets.mergeFrom(ruleContext, this, assetDeps);