This fixes an issue that arises when deduping cc build component registration code. The fuzzer and fuzzer_deps post deps mutators were not previously added when running cc tests. That meant the tests were not actually testing the same behavior as at runtime. Adding the mutators breaks the TestFuzzTarget test as the mutator changes the variant of the fuzz_smoke_test that is created and so the test fails to find it. This fixes the test by correct the variant name. Test: m checkbuild Bug: 146540677 Change-Id: I9d2be0023affb7722f0399663fa18a2a5fb610d8
345 lines
8.1 KiB
Go
345 lines
8.1 KiB
Go
// Copyright (C) 2019 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cc
|
|
|
|
import (
|
|
"android/soong/android"
|
|
)
|
|
|
|
func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
|
|
RegisterPrebuiltBuildComponents(ctx)
|
|
ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
|
|
ctx.RegisterModuleType("cc_library", LibraryFactory)
|
|
ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)
|
|
ctx.RegisterModuleType("cc_object", ObjectFactory)
|
|
|
|
android.RegisterPrebuiltMutators(ctx)
|
|
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
ctx.BottomUp("vndk", VndkMutator).Parallel()
|
|
ctx.BottomUp("link", LinkageMutator).Parallel()
|
|
ctx.BottomUp("ndk_api", NdkApiMutator).Parallel()
|
|
ctx.BottomUp("test_per_src", TestPerSrcMutator).Parallel()
|
|
ctx.BottomUp("version", VersionMutator).Parallel()
|
|
ctx.BottomUp("begin", BeginMutator).Parallel()
|
|
ctx.BottomUp("sysprop_cc", SyspropMutator).Parallel()
|
|
})
|
|
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
ctx.TopDown("fuzzer_deps", sanitizerDepsMutator(fuzzer))
|
|
ctx.BottomUp("fuzzer", sanitizerMutator(fuzzer)).Parallel()
|
|
|
|
ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator).Parallel()
|
|
ctx.BottomUp("sanitize_runtime", sanitizerRuntimeMutator).Parallel()
|
|
})
|
|
}
|
|
|
|
func GatherRequiredDepsForTest(os android.OsType) string {
|
|
ret := `
|
|
toolchain_library {
|
|
name: "libatomic",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libcompiler_rt-extras",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.builtins-arm-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.builtins-aarch64-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.builtins-i686-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.builtins-x86_64-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.fuzzer-arm-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.fuzzer-aarch64-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.fuzzer-i686-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.fuzzer-x86_64-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libclang_rt.fuzzer-x86_64",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
// Needed for sanitizer
|
|
cc_prebuilt_library_shared {
|
|
name: "libclang_rt.ubsan_standalone-aarch64-android",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
srcs: [""],
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libgcc",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
toolchain_library {
|
|
name: "libgcc_stripped",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
src: "",
|
|
}
|
|
|
|
cc_library {
|
|
name: "libc",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
recovery_available: true,
|
|
}
|
|
llndk_library {
|
|
name: "libc",
|
|
symbol_file: "",
|
|
}
|
|
cc_library {
|
|
name: "libm",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
recovery_available: true,
|
|
}
|
|
llndk_library {
|
|
name: "libm",
|
|
symbol_file: "",
|
|
}
|
|
cc_library {
|
|
name: "libdl",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
recovery_available: true,
|
|
}
|
|
llndk_library {
|
|
name: "libdl",
|
|
symbol_file: "",
|
|
}
|
|
cc_library {
|
|
name: "libft2",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
recovery_available: true,
|
|
}
|
|
llndk_library {
|
|
name: "libft2",
|
|
symbol_file: "",
|
|
vendor_available: false,
|
|
}
|
|
cc_library {
|
|
name: "libc++_static",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
}
|
|
cc_library {
|
|
name: "libc++",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
vndk: {
|
|
enabled: true,
|
|
support_system_process: true,
|
|
},
|
|
}
|
|
cc_library {
|
|
name: "libc++demangle",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
host_supported: false,
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
}
|
|
cc_library {
|
|
name: "libunwind_llvm",
|
|
no_libcrt: true,
|
|
nocrt: true,
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
vendor_available: true,
|
|
recovery_available: true,
|
|
}
|
|
|
|
cc_object {
|
|
name: "crtbegin_so",
|
|
recovery_available: true,
|
|
vendor_available: true,
|
|
stl: "none",
|
|
}
|
|
|
|
cc_object {
|
|
name: "crtbegin_dynamic",
|
|
recovery_available: true,
|
|
vendor_available: true,
|
|
}
|
|
|
|
cc_object {
|
|
name: "crtbegin_static",
|
|
recovery_available: true,
|
|
vendor_available: true,
|
|
}
|
|
|
|
cc_object {
|
|
name: "crtend_so",
|
|
recovery_available: true,
|
|
vendor_available: true,
|
|
stl: "none",
|
|
}
|
|
|
|
cc_object {
|
|
name: "crtend_android",
|
|
recovery_available: true,
|
|
vendor_available: true,
|
|
}
|
|
|
|
cc_library {
|
|
name: "libprotobuf-cpp-lite",
|
|
}
|
|
`
|
|
if os == android.Fuchsia {
|
|
ret += `
|
|
cc_library {
|
|
name: "libbioniccompat",
|
|
stl: "none",
|
|
}
|
|
cc_library {
|
|
name: "libcompiler_rt",
|
|
stl: "none",
|
|
}
|
|
`
|
|
}
|
|
return ret
|
|
}
|
|
|
|
func TestConfig(buildDir string, os android.OsType, env map[string]string,
|
|
bp string, fs map[string][]byte) android.Config {
|
|
|
|
// 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,
|
|
}
|
|
|
|
for k, v := range fs {
|
|
mockFS[k] = v
|
|
}
|
|
|
|
var config android.Config
|
|
if os == android.Fuchsia {
|
|
config = android.TestArchConfigFuchsia(buildDir, env, bp, mockFS)
|
|
} else {
|
|
config = android.TestArchConfig(buildDir, env, bp, mockFS)
|
|
}
|
|
|
|
return config
|
|
}
|
|
|
|
func CreateTestContext() *android.TestContext {
|
|
ctx := android.NewTestArchContext()
|
|
ctx.RegisterModuleType("cc_defaults", defaultsFactory)
|
|
ctx.RegisterModuleType("cc_binary", BinaryFactory)
|
|
ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)
|
|
ctx.RegisterModuleType("cc_fuzz", FuzzFactory)
|
|
ctx.RegisterModuleType("cc_library_shared", LibrarySharedFactory)
|
|
ctx.RegisterModuleType("cc_library_static", LibraryStaticFactory)
|
|
ctx.RegisterModuleType("cc_library_headers", LibraryHeaderFactory)
|
|
ctx.RegisterModuleType("cc_test", TestFactory)
|
|
ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)
|
|
ctx.RegisterModuleType("ndk_library", NdkLibraryFactory)
|
|
ctx.RegisterModuleType("vendor_public_library", vendorPublicLibraryFactory)
|
|
ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
|
|
ctx.RegisterModuleType("vndk_prebuilt_shared", VndkPrebuiltSharedFactory)
|
|
ctx.RegisterModuleType("vndk_libraries_txt", VndkLibrariesTxtFactory)
|
|
RegisterRequiredBuildComponentsForTest(ctx)
|
|
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
ctx.TopDown("double_loadable", checkDoubleLoadableLibraries).Parallel()
|
|
})
|
|
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
|
|
ctx.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton)
|
|
|
|
return ctx
|
|
}
|