diff options
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.java | 3 |
1 files changed, 3 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 dc1312662e..6e14804023 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 @@ -169,6 +169,7 @@ public final class AndroidRuleClasses { public static final String DEFAULT_MANIFEST_MERGER = "//tools/android:manifest_merger"; public static final String DEFAULT_RCLASS_GENERATOR = "//tools/android:rclass_generator"; public static final String DEFAULT_RESOURCES_PROCESSOR = "//tools/android:resources_processor"; + public static final String DEFAULT_RESOURCE_MERGER = "//tools/android:resource_merger"; public static final String DEFAULT_RESOURCE_PARSER = "//tools/android:resource_parser"; public static final String DEFAULT_RESOURCE_SHRINKER = "//tools/android:resource_shrinker"; public static final String DEFAULT_SDK = "//tools/android:sdk"; @@ -408,6 +409,8 @@ public final class AndroidRuleClasses { env.getToolsLabel(DEFAULT_RCLASS_GENERATOR))) .add(attr("$android_resources_processor", LABEL).cfg(HOST).exec().value( env.getToolsLabel(DEFAULT_RESOURCES_PROCESSOR))) + .add(attr("$android_resource_merger", LABEL).cfg(HOST).exec().value( + env.getToolsLabel(DEFAULT_RESOURCE_MERGER))) .add(attr("$android_resource_parser", LABEL).cfg(HOST).exec().value( env.getToolsLabel(DEFAULT_RESOURCE_PARSER))) .add(attr("$android_resource_shrinker", LABEL).cfg(HOST).exec().value( |