Merge "Switch cc_test host_supported: true to unit tests"
This commit is contained in:
commit
251261d01b
|
@ -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(),
|
||||
|
|
Loading…
Reference in New Issue