diff options
| author |  corysmith <corysmith@google.com> | 2018-07-18 14:22:06 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-18 14:23:42 -0700 |
| commit | 01630833a157054064ab3beab074c4e73f57c185 (patch) | |
| tree | 380e7c33a86523b3a48593f9a761ff48284d665b /src/main/java/com/google/devtools | |
| parent | 34fd09d89918e33d6cde522f8d4e4fc075004343 (diff) | |
Enable aapt2 for aar_import by adding the AndroidConfiguration fragment.
RELNOTES: Fixed compatibility with aar_import when using aapt2. AAPT2 is now supported for Android app builds without resource shrinking. To use it, pass the `--android_aapt=aapt2` flag or define android_binary.aapt_version=aapt2.
PiperOrigin-RevId: 205136160
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java index 8f4143b0d4..6a3fd50045 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java @@ -73,12 +73,13 @@ public class AarImportBaseRule implements RuleDefinition { .cfg(HostTransition.INSTANCE) .exec() .value(env.getToolsLabel("//tools/android:aar_import_deps_checker"))) - .add(attr(ZIPPER, LABEL) - .cfg(HostTransition.INSTANCE) - .exec() - .value(env.getToolsLabel("//tools/zip:zipper"))) + .add( + attr(ZIPPER, LABEL) + .cfg(HostTransition.INSTANCE) + .exec() + .value(env.getToolsLabel("//tools/zip:zipper"))) .advertiseSkylarkProvider(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())) - .requiresConfigurationFragments(JavaConfiguration.class) + .requiresConfigurationFragments(AndroidConfiguration.class, JavaConfiguration.class) .build(); } |