aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
diff options
context:
space:
mode:
authorGravatar asteinb <asteinb@google.com>2018-04-17 07:09:31 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-04-17 07:11:07 -0700
commitb701530ca8beaf190143b502828f4d91132981b1 (patch)
tree573ce823952eb297fe4e65aa9ca3511bedc57c9d /src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
parent451cfecf840c1148aae557f9f133f6a884d8411a (diff)
Independently merge assets
Merges assets using the newly created action. Also, add BusyBoxActionBuilder to collect common boilerplate for spawning an action that invokes the Android busybox. RELNOTES: none PiperOrigin-RevId: 193192621
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 433fc7f562..b40413e116 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -111,6 +111,8 @@ public final class AndroidRuleClasses {
fromTemplates("%{name}_shrunk.ap_");
public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_ZIP =
fromTemplates("%{name}_files/resource_files.zip");
+ public static final SafeImplicitOutputsFunction ANDROID_ASSETS_ZIP =
+ fromTemplates("%{name}_files/assets.zip");
public static final SafeImplicitOutputsFunction ANDROID_RESOURCES_SHRUNK_ZIP =
fromTemplates("%{name}_files/resource_files_shrunk.zip");
public static final SafeImplicitOutputsFunction ANDROID_RESOURCE_SHRINKER_LOG =