diff options
| author |  cnsun <cnsun@google.com> | 2018-05-16 11:24:33 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-16 11:26:16 -0700 |
| commit | 14c8de626fbd5a63cf843b98c3bef055071d361c (patch) | |
| tree | 4c58527122905644c69d27e732fff8c8df2a30df /src/main/java/com | |
| parent | 6390584b919e995e73a7412a92354d07e2755e0f (diff) | |
Make ImportDepsCheckingLevel.ERROR essentially the same as STRICT_ERROR, checking direct dependencies.
RELNOTES: None.
PiperOrigin-RevId: 196860008
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java index 859d296297..69ef0ff297 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArgs.ClasspathTyp import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaConfiguration; -import com.google.devtools.build.lib.rules.java.JavaConfiguration.ImportDepsCheckingLevel; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo; @@ -165,17 +164,15 @@ public class AarImport implements RuleConfiguredTargetFactory { JavaConfiguration javaConfig = ruleContext.getFragment(JavaConfiguration.class); - NestedSet<Artifact> deps = - getCompileTimeJarsFromCollection( - targets, - javaConfig.getImportDepsCheckingLevel() == ImportDepsCheckingLevel.STRICT_ERROR); + // TODO(cnsun): need to pass the transitive classpath too to emit add dep command. + NestedSet<Artifact> directDeps = getCompileTimeJarsFromCollection(targets, /*isStrict=*/ true); NestedSet<Artifact> bootclasspath = getBootclasspath(ruleContext); Artifact depsCheckerResult = createAarArtifact(ruleContext, "aar_import_deps_checker_result.txt"); Artifact jdepsArtifact = createAarArtifact(ruleContext, "jdeps.proto"); ImportDepsCheckActionBuilder.newBuilder() .bootcalsspath(bootclasspath) - .declareDeps(deps) + .declareDeps(directDeps) .checkJars(NestedSetBuilder.<Artifact>stableOrder().add(mergedJar).build()) .outputArtifiact(depsCheckerResult) .importDepsCheckingLevel(javaConfig.getImportDepsCheckingLevel()) |