StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete mixedBuildSupportedCcTest."

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-21 15:16:18 +00:00
committed by Gerrit Code Review
parent 03e6e00e60 a485d0935c
commit fdef3506c7
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/allowlists/allowlists.go
View File

@@ -939,6 +939,11 @@ var (
"libandroidfw_tests", "aapt2_tests", // failing due to data path issues "libandroidfw_tests", "aapt2_tests", // failing due to data path issues
// error: overriding commands for target
// `out/host/linux-x86/nativetest64/gmock_tests/gmock_tests__cc_runner_test',
// previously defined at out/soong/installs-aosp_arm.mk:64919`
"gmock_tests",
// cc_test with unconverted deps, or are device-only (and not verified to pass yet) // cc_test with unconverted deps, or are device-only (and not verified to pass yet)
"AMRWBEncTest", "AMRWBEncTest",
"AmrnbDecoderTest", // depends on unconverted modules: libaudioutils, libsndfile "AmrnbDecoderTest", // depends on unconverted modules: libaudioutils, libsndfile

19
cc/cc.go
View File

@@ -1890,26 +1890,9 @@ func (c *Module) QueueBazelCall(ctx android.BaseModuleContext) {
c.bazelHandler.QueueBazelCall(ctx, c.getBazelModuleLabel(ctx)) c.bazelHandler.QueueBazelCall(ctx, c.getBazelModuleLabel(ctx))
} }
var (
mixedBuildSupportedCcTest = []string{
"adbd_test",
"adb_crypto_test",
"adb_pairing_auth_test",
"adb_pairing_connection_test",
"adb_tls_connection_test",
}
)
// IsMixedBuildSupported returns true if the module should be analyzed by Bazel // IsMixedBuildSupported returns true if the module should be analyzed by Bazel
// in any of the --bazel-mode(s). This filters at the module level and takes // in any of the --bazel-mode(s).
// precedence over the allowlists in allowlists/allowlists.go.
func (c *Module) IsMixedBuildSupported(ctx android.BaseModuleContext) bool { func (c *Module) IsMixedBuildSupported(ctx android.BaseModuleContext) bool {
_, isForTesting := ctx.Config().BazelContext.(android.MockBazelContext)
if c.testBinary() && !android.InList(c.Name(), mixedBuildSupportedCcTest) && !isForTesting {
// Per-module rollout of mixed-builds for cc_test modules.
return false
}
// TODO(b/261058727): Remove this (enable mixed builds for modules with UBSan) // TODO(b/261058727): Remove this (enable mixed builds for modules with UBSan)
// Currently we can only support ubsan when minimum runtime is used. // Currently we can only support ubsan when minimum runtime is used.
return c.bazelHandler != nil && (!isUbsanEnabled(c) || c.MinimalRuntimeNeeded()) return c.bazelHandler != nil && (!isUbsanEnabled(c) || c.MinimalRuntimeNeeded())