From 14c8de626fbd5a63cf843b98c3bef055071d361c Mon Sep 17 00:00:00 2001
From: cnsun <cnsun@google.com>
Date: Wed, 16 May 2018 11:24:33 -0700
Subject: Make ImportDepsCheckingLevel.ERROR essentially the same as
 STRICT_ERROR, checking direct dependencies.

RELNOTES: None.
PiperOrigin-RevId: 196860008
---
 .../com/google/devtools/build/lib/rules/android/AarImport.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/main/java/com')

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())
-- 
cgit v1.2.3