diff options
| author |  kmb <kmb@google.com> | 2018-07-03 12:19:06 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-03 12:20:45 -0700 |
| commit | 0d8136849d900af15f2b94eda4c04efb8ff13186 (patch) | |
| tree | 545469c0c00fb83b8dcf92ea9ad3fdb7f4217c6c /src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java | |
| parent | 88a20ee08c0af7cf187893bcafe0771e5a19ff9d (diff) | |
supply transitive and direct deps for aar_import deps checking. This allows producing add_dep commands where possible and avoids the need for direct dependencies on supertypes of directly depended types
RELNOTES: None.
PiperOrigin-RevId: 203164113
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java | 10 |
1 files changed, 8 insertions, 2 deletions
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 82b9455473..b94c2e3025 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 @@ -231,6 +231,7 @@ public class AarImportTest extends BuildViewTestCase { .containsAllOf( "--bootclasspath_entry", "--classpath_entry", + "--directdep", "--input", "--output", "--checking_mode=error", @@ -239,7 +240,9 @@ public class AarImportTest extends BuildViewTestCase { ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(1); + .isEqualTo(5); // transitive classpath + assertThat(arguments.stream().filter(arg -> "--directdep".equals(arg)).count()) + .isEqualTo(1); // 1 declared dep } @Test @@ -270,6 +273,7 @@ public class AarImportTest extends BuildViewTestCase { .containsAllOf( "--bootclasspath_entry", "--classpath_entry", + "--directdep", "--input", "--output", "--checking_mode=error", @@ -278,7 +282,9 @@ public class AarImportTest extends BuildViewTestCase { ensureArgumentsHaveClassEntryOptionWithSuffix( arguments, "/intermediate/classes_and_libs_merged.jar"); assertThat(arguments.stream().filter(arg -> "--classpath_entry".equals(arg)).count()) - .isEqualTo(1); + .isEqualTo(5); // transitive classpath + assertThat(arguments.stream().filter(arg -> "--directdep".equals(arg)).count()) + .isEqualTo(1); // 1 declared dep } @Test |