Stop making the ndk headers host-specific

This breaks when I enable a second host configuration for host bionic.

Make non-arch modules !Device and !Host by adding "Generic" as the zero
value. Make the SkipDeviceInstall config only apply to Device modules.

Test: out/soong/build.ninja is identical expect for comments
Change-Id: I6e2bd3814a9968554d3901a508d822d5c79d08a0
This commit is contained in:
Dan Willemsen
2016-11-28 17:50:06 -08:00
parent 7752bca25d
commit 0e2d97b4b1
3 changed files with 5 additions and 9 deletions

View File

@@ -217,7 +217,8 @@ type OsType struct {
type OsClass int
const (
Device OsClass = iota
Generic OsClass = iota
Device
Host
HostCross
)

View File

@@ -631,7 +631,7 @@ func (a *androidModuleContext) InstallFileName(installPath OutputPath, name stri
a.module.base().hooks.runInstallHooks(a, fullInstallPath, false)
if !a.module.base().commonProperties.SkipInstall &&
(a.Host() || !a.AConfig().SkipDeviceInstall()) {
(!a.Device() || !a.AConfig().SkipDeviceInstall()) {
deps = append(deps, a.installDeps...)
@@ -669,7 +669,7 @@ func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name strin
a.module.base().hooks.runInstallHooks(a, fullInstallPath, true)
if !a.module.base().commonProperties.SkipInstall &&
(a.Host() || !a.AConfig().SkipDeviceInstall()) {
(!a.Device() || !a.AConfig().SkipDeviceInstall()) {
a.ModuleBuild(pctx, ModuleBuildParams{
Rule: Symlink,