From 967c6a9b87eb4eca13449498183e3f191843c9cd Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 17 Nov 2016 00:30:56 -0800
Subject: [PATCH] Allow Host cc_object and cc_toolchain_library

In preparation for LinuxBionic.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I8e4631ccc3ad5161d76871a43f31d5a4ecbd39c0
---
 cc/object.go            | 2 +-
 cc/toolchain_library.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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,
 	}