diff options
Diffstat (limited to 'cc/ndk_headers.go')
| -rw-r--r-- | cc/ndk_headers.go | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go index 516f6e200..5fa323263 100644 --- a/cc/ndk_headers.go +++ b/cc/ndk_headers.go @@ -137,9 +137,11 @@ func (m *headerModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } -func ndkHeadersFactory() (blueprint.Module, []interface{}) { +func ndkHeadersFactory() android.Module { module := &headerModule{} - return android.InitAndroidModule(module, &module.properties) + module.AddProperties(&module.properties) + android.InitAndroidModule(module) + return module } type preprocessedHeaderProperies struct { @@ -251,12 +253,16 @@ func processHeadersWithVersioner(ctx android.ModuleContext, srcDir, outDir andro return timestampFile } -func preprocessedNdkHeadersFactory() (blueprint.Module, []interface{}) { +func preprocessedNdkHeadersFactory() android.Module { module := &preprocessedHeaderModule{} + + module.AddProperties(&module.properties) + // 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) + android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + + return module } |