diff options
| author | Colin Cross <ccross@android.com> | 2020-06-07 17:02:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-06-15 09:46:31 -0700 |
| commit | 5a3458ddc0ec26bfb9230b2daf66b4070a854278 (patch) | |
| tree | 9d69c16de7d8d50cbeed307f6462c0424871a343 /cc | |
| parent | f5f663b0c392a0a0ed3b9872bb0b3d3b2bb47fba (diff) | |
| download | build_soong-5a3458ddc0ec26bfb9230b2daf66b4070a854278.tar.gz build_soong-5a3458ddc0ec26bfb9230b2daf66b4070a854278.tar.bz2 build_soong-5a3458ddc0ec26bfb9230b2daf66b4070a854278.zip | |
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 2fce23ae6d0e66c00940fd249845c4880b478092)
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/testing.go | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/cc/testing.go b/cc/testing.go index d92309f3..7a86a8d2 100644 --- a/cc/testing.go +++ b/cc/testing.go @@ -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) |