diff --git a/cc/testing.go b/cc/testing.go index edbb24d13..479b424ab 100644 --- a/cc/testing.go +++ b/cc/testing.go @@ -467,15 +467,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, @@ -484,20 +475,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)