diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java | 9 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java | 12 |
2 files changed, 5 insertions, 16 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()) diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java index b427c7c988..8ee5e085c0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java @@ -235,14 +235,10 @@ public class AarImportTest extends BuildViewTestCase { "--checking_mode=error", "--rule_label", "--jdeps_output"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/bar/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/java/baz-ijar.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/foo/classes_and_libs_merged.jar"); ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(5); + .isEqualTo(1); } @Test @@ -278,14 +274,10 @@ public class AarImportTest extends BuildViewTestCase { "--checking_mode=error", "--rule_label", "--jdeps_output"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/bar/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/java/baz-ijar.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/baz/classes_and_libs_merged.jar"); - ensureArgumentsHaveClassEntryOptionWithSuffix(arguments, "/foo/classes_and_libs_merged.jar"); ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(5); + .isEqualTo(1); } @Test |