From 26616d4cfd4ca582ad450a7062408ebbe2fb0ae6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sat, 17 Apr 2021 05:17:03 +0000
Subject: [PATCH] Revert "Add jni_libs property to java tests"

This reverts commit 246164a055a529e081a7690cc9043b496757a30c.

Reason for revert: broke the mac build
Bug: 176593487

Change-Id: Id0242e37aa40d84d291bf7b8ee46dfe98c4d5905
---
 java/java.go      | 34 ----------------------------------
 java/java_test.go | 26 --------------------------
 2 files changed, 60 deletions(-)

diff --git a/java/java.go b/java/java.go
index bc5bdb192..59ec94d5b 100644
--- a/java/java.go
+++ b/java/java.go
@@ -29,7 +29,6 @@ import (
 	"github.com/google/blueprint/proptools"
 
 	"android/soong/android"
-	"android/soong/cc"
 	"android/soong/dexpreopt"
 	"android/soong/java/config"
 	"android/soong/tradefed"
@@ -2388,9 +2387,6 @@ type testProperties struct {
 
 	// Test options.
 	Test_options TestOptions
-
-	// Names of modules containing JNI libraries that should be installed alongside the test.
-	Jni_libs []string
 }
 
 type hostTestProperties struct {
@@ -2452,13 +2448,6 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) {
 		}
 	}
 
-	if len(j.testProperties.Jni_libs) > 0 {
-		for _, target := range ctx.MultiTargets() {
-			sharedLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"})
-			ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, j.testProperties.Jni_libs...)
-		}
-	}
-
 	j.deps(ctx)
 }
 
@@ -2474,29 +2463,6 @@ func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 		j.data = append(j.data, android.OutputFileForModule(ctx, dep, ""))
 	})
 
-	ctx.VisitDirectDepsWithTag(jniLibTag, func(dep android.Module) {
-		sharedLibInfo := ctx.OtherModuleProvider(dep, cc.SharedLibraryInfoProvider).(cc.SharedLibraryInfo)
-		if sharedLibInfo.SharedLibrary != nil {
-			// Copy to an intermediate output directory to append "lib[64]" to the path,
-			// so that it's compatible with the default rpath values.
-			var relPath string
-			if sharedLibInfo.Target.Arch.ArchType.Multilib == "lib64" {
-				relPath = filepath.Join("lib64", sharedLibInfo.SharedLibrary.Base())
-			} else {
-				relPath = filepath.Join("lib", sharedLibInfo.SharedLibrary.Base())
-			}
-			relocatedLib := android.PathForModuleOut(ctx, "relocated").Join(ctx, relPath)
-			ctx.Build(pctx, android.BuildParams{
-				Rule:   android.Cp,
-				Input:  sharedLibInfo.SharedLibrary,
-				Output: relocatedLib,
-			})
-			j.data = append(j.data, relocatedLib)
-		} else {
-			ctx.PropertyErrorf("jni_libs", "%q of type %q is not supported", dep.Name(), ctx.OtherModuleType(dep))
-		}
-	})
-
 	j.Library.GenerateAndroidBuildActions(ctx)
 }
 
diff --git a/java/java_test.go b/java/java_test.go
index 73734feb1..7b8984810 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -499,32 +499,6 @@ func TestBinary(t *testing.T) {
 	}
 }
 
-func TestTest(t *testing.T) {
-	ctx, _ := testJava(t, `
-		java_test_host {
-			name: "foo",
-			srcs: ["a.java"],
-			jni_libs: ["libjni"],
-		}
-
-		cc_library_shared {
-			name: "libjni",
-			host_supported: true,
-			device_supported: false,
-			stl: "none",
-		}
-	`)
-
-	buildOS := android.BuildOs.String()
-
-	foo := ctx.ModuleForTests("foo", buildOS+"_common").Module().(*TestHost)
-
-	fooTestData := foo.data
-	if len(fooTestData) != 1 || fooTestData[0].Rel() != "lib64/libjni.so" {
-		t.Errorf(`expected foo test data relative path ["lib64/libjni.so"], got %q`, fooTestData.Strings())
-	}
-}
-
 func TestHostBinaryNoJavaDebugInfoOverride(t *testing.T) {
 	bp := `
 		java_library {