diff --git a/cc/object.go b/cc/object.go
index 57cc8b055..16ed45518 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -36,7 +36,7 @@ type objectLinker struct {
 }
 
 func objectFactory() (blueprint.Module, []interface{}) {
-	module := newBaseModule(android.DeviceSupported, android.MultilibBoth)
+	module := newBaseModule(android.HostAndDeviceSupported, android.MultilibBoth)
 	module.linker = &objectLinker{
 		baseLinker: NewBaseLinker(),
 	}
diff --git a/cc/toolchain_library.go b/cc/toolchain_library.go
index 2f3c9a1a0..521553e49 100644
--- a/cc/toolchain_library.go
+++ b/cc/toolchain_library.go
@@ -39,7 +39,7 @@ func (*toolchainLibraryDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) D
 }
 
 func toolchainLibraryFactory() (blueprint.Module, []interface{}) {
-	module, library := NewLibrary(android.DeviceSupported, false, true)
+	module, library := NewLibrary(android.HostAndDeviceSupported, false, true)
 	toolchainLibrary := &toolchainLibraryDecorator{
 		libraryDecorator: library,
 	}