Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a3458dd authored by Colin Cross's avatar Colin Cross
Browse files

Remove paths from cc.TestConfig 

Now that tests don't need to specify every path passed to
PathForSource or PathForModuleSrc, remove them from cc.TestConfig.

Bug: 153485543
Test: all soong tests
Change-Id: I90cd7b4dfc49c156afbb0eea9a77159c3e1860fa
Merged-In: I90cd7b4dfc49c156afbb0eea9a77159c3e1860fa
(cherry picked from commit 2fce23ae)
parent f5f663b0

cc/testing.go

+1 −23
Original line number Diff line number Diff line
@@ -428,15 +428,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string { 
}



func GatherRequiredFilesForTest(fs map[string][]byte) {

	fs["prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-arm/usr/lib/crtbegin_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-arm/usr/lib/crtend_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-arm64/usr/lib/crtbegin_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-arm64/usr/lib/crtend_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-x86/usr/lib/crtbegin_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-x86/usr/lib/crtend_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-x86_64/usr/lib64/crtbegin_so.o"] = nil

	fs["prebuilts/ndk/current/platforms/android-27/arch-x86_64/usr/lib64/crtend_so.o"] = nil

}



func TestConfig(buildDir string, os android.OsType, env map[string]string,
@@ -445,20 +436,7 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string, 
	// add some modules that are required by the compiler and/or linker

	bp = bp + GatherRequiredDepsForTest(os)



	mockFS := map[string][]byte{

		"foo.c":       nil,

		"foo.lds":     nil,

		"bar.c":       nil,

		"baz.c":       nil,

		"baz.o":       nil,

		"a.proto":     nil,

		"b.aidl":      nil,

		"sub/c.aidl":  nil,

		"my_include":  nil,

		"foo.map.txt": nil,

		"liba.so":     nil,

		"libb.a":      nil,

	}

	mockFS := map[string][]byte{}



	GatherRequiredFilesForTest(mockFS)