diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2017-02-14 23:11:23 +0000 |
|---|---|---|
| committer | Dmitry Lomov <dslomov@google.com> | 2017-02-15 10:05:35 +0000 |
| commit | e851fe29cc5b13cae3cae383c548e86c150a93fe (patch) | |
| tree | 9bdcb4f89285489b334732f804e8a20c5dcc9c60 /src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | |
| parent | 053966cfa94bf67e1db118a1eac4ec9ce222f07d (diff) | |
Restrict aspects visible to other aspects according to their advertised providers.
--
PiperOrigin-RevId: 147526961
MOS_MIGRATED_REVID=147526961
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index 5518692436..ebd734bb45 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java @@ -136,7 +136,8 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu .allowedRuleClasses("android_sdk", "filegroup") .value(new AndroidRuleClasses.AndroidSdkLabel( Label.parseAbsoluteUnchecked(toolsRepository + AndroidRuleClasses.DEFAULT_SDK)))) - .requiresConfigurationFragments(AndroidConfiguration.class); + .requiresConfigurationFragments(AndroidConfiguration.class) + .requireAspectsWithNativeProviders(JavaCompilationArgsAspectProvider.class); if (TriState.valueOf(params.getOnlyValueOfAttribute("incremental_dexing")) != TriState.NO) { // Marginally improves "query2" precision for targets that disable incremental dexing result.add(attr(ASPECT_DEXBUILDER_PREREQ, LABEL).cfg(HOST).exec() |