Add java/fuzz_test.go to test sources

Context
- fuzz_test.go is not listed in the soong/java test sources and is not
  running on CI.

Implementation
- Fix fuzz_test.go and add to test sources

Test: m
Change-Id: If2685c646dec4885fc42d7760992309bfa9da382

2 files changed, 5 insertions, 5 deletions

diff --git a/java/Android.bp b/java/Android.bp
index 0bf7a0b26..9d633198a 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -91,6 +91,7 @@ bootstrap_go_package {
         "dexpreopt_config_test.go",
         "droiddoc_test.go",
         "droidstubs_test.go",
+        "fuzz_test.go",
         "genrule_test.go",
         "hiddenapi_singleton_test.go",
         "jacoco_test.go",
diff --git a/java/fuzz_test.go b/java/fuzz_test.go
index 0a2c94517..6e5d912cb 100644
--- a/java/fuzz_test.go
+++ b/java/fuzz_test.go
@@ -65,9 +65,8 @@ func TestJavaFuzz(t *testing.T) {
 
 	osCommonTarget := result.Config.BuildOSCommonTarget.String()
 
-	osCommonTargetWithSan := osCommonTarget + "_asan" + "_fuzzer"
-	javac := result.ModuleForTests("foo", osCommonTargetWithSan).Rule("javac")
-	combineJar := result.ModuleForTests("foo", osCommonTargetWithSan).Description("for javac")
+	javac := result.ModuleForTests("foo", osCommonTarget).Rule("javac")
+	combineJar := result.ModuleForTests("foo", osCommonTarget).Description("for javac")
 
 	if len(javac.Inputs) != 1 || javac.Inputs[0].String() != "a.java" {
 		t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs)
@@ -85,9 +84,9 @@ func TestJavaFuzz(t *testing.T) {
 	}
 
 	ctx := result.TestContext
-	foo := ctx.ModuleForTests("foo", osCommonTargetWithSan).Module().(*JavaFuzzLibrary)
+	foo := ctx.ModuleForTests("foo", osCommonTarget).Module().(*JavaFuzzLibrary)
 
-	expected := "libjni.so"
+	expected := "lib64/libjni.so"
 	if runtime.GOOS == "darwin" {
 		expected = "libjni.dylib"
 	}