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:
@@ -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 {
|
||||
|
Reference in New Issue
Block a user