Revert "Add data bin and lib properties to sh_test"

This reverts commit 91dbd520dec7abcca8983792df4369401e7aa963.

Reason for revert: Fix CLs didn't completely fix the builds.

Test: sh_binary_test.go
Bug: 156980228
Bug: 164465992
Change-Id: I1ed214c2ea6cd460db909a103c4b3a9a895ad9f7

1 files changed, 0 insertions, 110 deletions

diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go
index 650efa5d6..3bfe6110a 100644
--- a/sh/sh_binary_test.go
+++ b/sh/sh_binary_test.go
@@ -3,12 +3,10 @@ package sh
 import (
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"reflect"
 	"testing"
 
 	"android/soong/android"
-	"android/soong/cc"
 )
 
 var buildDir string
@@ -48,9 +46,6 @@ func testShBinary(t *testing.T, bp string) (*android.TestContext, android.Config
 	ctx := android.NewTestArchContext()
 	ctx.RegisterModuleType("sh_test", ShTestFactory)
 	ctx.RegisterModuleType("sh_test_host", ShTestHostFactory)
-
-	cc.RegisterRequiredBuildComponentsForTest(ctx)
-
 	ctx.Register(config)
 	_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
 	android.FailIfErrored(t, errs)
@@ -110,61 +105,6 @@ func TestShTest(t *testing.T) {
 	}
 }
 
-func TestShTest_dataModules(t *testing.T) {
-	ctx, config := testShBinary(t, `
-		sh_test {
-			name: "foo",
-			src: "test.sh",
-			host_supported: true,
-			data_bins: ["bar"],
-			data_libs: ["libbar"],
-		}
-
-		cc_binary {
-			name: "bar",
-			host_supported: true,
-			shared_libs: ["libbar"],
-			no_libcrt: true,
-			nocrt: true,
-			system_shared_libs: [],
-			stl: "none",
-		}
-
-		cc_library {
-			name: "libbar",
-			host_supported: true,
-			no_libcrt: true,
-			nocrt: true,
-			system_shared_libs: [],
-			stl: "none",
-		}
-	`)
-
-	buildOS := android.BuildOs.String()
-	arches := []string{"android_arm64_armv8-a", buildOS + "_x86_64"}
-	for _, arch := range arches {
-		variant := ctx.ModuleForTests("foo", arch)
-
-		relocated := variant.Output("relocated/lib64/libbar.so")
-		expectedInput := filepath.Join(buildDir, ".intermediates/libbar/"+arch+"_shared/libbar.so")
-		if relocated.Input.String() != expectedInput {
-			t.Errorf("Unexpected relocation input, expected: %q, actual: %q",
-				expectedInput, relocated.Input.String())
-		}
-
-		mod := variant.Module().(*ShTest)
-		entries := android.AndroidMkEntriesForTest(t, config, "", mod)[0]
-		expectedData := []string{
-			filepath.Join(buildDir, ".intermediates/bar", arch, ":bar"),
-			filepath.Join(buildDir, ".intermediates/foo", arch, "relocated/:lib64/libbar.so"),
-		}
-		actualData := entries.EntryMap["LOCAL_TEST_DATA"]
-		if !reflect.DeepEqual(expectedData, actualData) {
-			t.Errorf("Unexpected test data, expected: %q, actual: %q", expectedData, actualData)
-		}
-	}
-}
-
 func TestShTestHost(t *testing.T) {
 	ctx, _ := testShBinary(t, `
 		sh_test_host {
@@ -184,53 +124,3 @@ func TestShTestHost(t *testing.T) {
 		t.Errorf("host bit is not set for a sh_test_host module.")
 	}
 }
-
-func TestShTestHost_dataDeviceModules(t *testing.T) {
-	ctx, config := testShBinary(t, `
-		sh_test_host {
-			name: "foo",
-			src: "test.sh",
-			data_device_bins: ["bar"],
-			data_device_libs: ["libbar"],
-		}
-
-		cc_binary {
-			name: "bar",
-			shared_libs: ["libbar"],
-			no_libcrt: true,
-			nocrt: true,
-			system_shared_libs: [],
-			stl: "none",
-		}
-
-		cc_library {
-			name: "libbar",
-			no_libcrt: true,
-			nocrt: true,
-			system_shared_libs: [],
-			stl: "none",
-		}
-	`)
-
-	buildOS := android.BuildOs.String()
-	variant := ctx.ModuleForTests("foo", buildOS+"_x86_64")
-
-	relocated := variant.Output("relocated/lib64/libbar.so")
-	expectedInput := filepath.Join(buildDir, ".intermediates/libbar/android_arm64_armv8-a_shared/libbar.so")
-	if relocated.Input.String() != expectedInput {
-		t.Errorf("Unexpected relocation input, expected: %q, actual: %q",
-			expectedInput, relocated.Input.String())
-	}
-
-	mod := variant.Module().(*ShTest)
-	entries := android.AndroidMkEntriesForTest(t, config, "", mod)[0]
-	expectedData := []string{
-		filepath.Join(buildDir, ".intermediates/bar/android_arm64_armv8-a/:bar"),
-		// libbar has been relocated, and so has a variant that matches the host arch.
-		filepath.Join(buildDir, ".intermediates/foo/"+buildOS+"_x86_64/relocated/:lib64/libbar.so"),
-	}
-	actualData := entries.EntryMap["LOCAL_TEST_DATA"]
-	if !reflect.DeepEqual(expectedData, actualData) {
-		t.Errorf("Unexpected test data, expected: %q, actual: %q", expectedData, actualData)
-	}
-}