From b701530ca8beaf190143b502828f4d91132981b1 Mon Sep 17 00:00:00 2001 From: asteinb Date: Tue, 17 Apr 2018 07:09:31 -0700 Subject: 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 --- .../com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java') 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 = -- cgit v1.2.3