openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch cc_test host_supported: true to unit tests 

Test: presubmit
Bug: 179092189
Change-Id: Ic5c3ca6de44732f6299ad9a35d1aaef622f3ff7f
This commit is contained in:
Julien Desprez 2021-02-04 10:10:16 -08:00
parent 53b2427fc9
commit 8908b37a14
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cc/test.go
View File

@ -232,7 +232,6 @@ func TestPerSrcMutator(mctx android.BottomUpMutatorContext) {
type testDecorator struct {
Properties TestProperties
linker *baseLinker
hod android.HostOrDeviceSupported
}
func (test *testDecorator) gtest() bool {
@ -432,8 +431,7 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
ctx.PropertyErrorf("no_named_install_directory", "Module install directory may only be disabled if relative_install_path is set")
}
// TODO(179092189): Clean up to use Ctx.Host() when generalizing to cc_test
if test.testDecorator.hod == android.HostSupported && test.gtest() && test.Properties.Test_options.Unit_test == nil {
if ctx.Host() && test.gtest() && test.Properties.Test_options.Unit_test == nil {
test.Properties.Test_options.Unit_test = proptools.BoolPtr(true)
}
test.binaryDecorator.baseInstaller.install(ctx, file)
@ -447,7 +445,6 @@ func NewTest(hod android.HostOrDeviceSupported) *Module {
test := &testBinary{
testDecorator: testDecorator{
linker: binary.baseLinker,
hod: hod,
},
binaryDecorator: binary,
baseCompiler: NewBaseCompiler(),