aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-11-17 00:30:56 -0800
committerDan Willemsen <dwillemsen@google.com>2016-11-17 01:50:14 -0800
commit967c6a9b87eb4eca13449498183e3f191843c9cd (patch)
treed6c5988fc474141d6c03c4af127e0f31e2e31e73 /cc
parent00fcbde4013a1289a5bd3f7e19ce81eb70b6c707 (diff)
downloadbuild_soong-967c6a9b87eb4eca13449498183e3f191843c9cd.tar.gz
build_soong-967c6a9b87eb4eca13449498183e3f191843c9cd.tar.bz2
build_soong-967c6a9b87eb4eca13449498183e3f191843c9cd.zip
Allow Host cc_object and cc_toolchain_library
In preparation for LinuxBionic. Bug: 31559095 Test: out/soong/build.ninja is identical Change-Id: I8e4631ccc3ad5161d76871a43f31d5a4ecbd39c0
Diffstat (limited to 'cc')
-rw-r--r--cc/object.go2
-rw-r--r--cc/toolchain_library.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/object.go b/cc/object.go
index 57cc8b05..16ed4551 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 2f3c9a1a..521553e4 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,
}