Make java_binary common variant a dependency

ctx.PrimaryModule() is wrong in the case of a java_binary that
supports both host and device, use an explicit dependency instead.
Once the dependency exists there is no need to manually request
the jar be installed, it will automatically be installed by the
host installation rules for dependencies.

Test: TestBinary
Change-Id: Iddeea2d08bc574c79d42139020558cd70d718ca1

1 files changed, 2 insertions, 3 deletions

diff --git a/java/java_test.go b/java/java_test.go
index a43e2a8c9..a727812b5 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -467,9 +467,8 @@ func TestBinary(t *testing.T) {
 	barWrapperDeps := barWrapper.Output("bar").Implicits.Strings()
 
 	// Test that the install binary wrapper depends on the installed jar file
-	if len(barWrapperDeps) != 1 || barWrapperDeps[0] != barJar {
-		t.Errorf("expected binary wrapper implicits [%q], got %v",
-			barJar, barWrapperDeps)
+	if g, w := barWrapperDeps, barJar; !android.InList(w, g) {
+		t.Errorf("expected binary wrapper implicits to contain %q, got %q", w, g)
 	}
 }