Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e2d97b4 authored Nov 28, 2016 by Dan Willemsen

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

parent 7752bca2

android/arch.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,8 @@ type OsType struct {
		type OsClass int

		const (
		Device OsClass = iota
		Generic OsClass = iota
		Device
		Host
		HostCross
		)

android/module.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

cc/ndk_headers.go

+1 −6

Original line number	Diff line number	Diff line
		@@ -138,12 +138,7 @@ func (m *headerModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {

		func ndkHeadersFactory() (blueprint.Module, []interface{}) {
		module := &headerModule{}
		// Host module rather than device module because device module install steps
		// do not get run when embedded in make. We're not any of the existing
		// module types that can be exposed via the Android.mk exporter, so just use
		// a host module.
		return android.InitAndroidArchModule(module, android.HostSupportedNoCross,
		android.MultilibFirst, &module.properties)
		return android.InitAndroidModule(module, &module.properties)
		}

		type preprocessedHeaderProperies struct {