StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use arch-specific modules when we want a single module

Browse Source 
This breaks when two host OSes are enabled for example.

Bug: 31559095
Test: enable host bionic as a second Host OS, attempt a build
Test: treehugger
Change-Id: If52f77d7d3b0755d768028cbddda320303a69e65
This commit is contained in:
Dan Willemsen
2018-10-10 17:18:08 -07:00
parent 0ef639bb59
commit 4f644da0ad
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/ndk_headers.go
View File

@@ -278,11 +278,7 @@ func versionedNdkHeadersFactory() android.Module {
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
// Host module rather than device module because device module install steps android.InitAndroidModule(module)
// 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.
android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst)
return module return module
} }
@@ -362,11 +358,7 @@ func preprocessedNdkHeadersFactory() android.Module {
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
// Host module rather than device module because device module install steps android.InitAndroidModule(module)
// 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.
android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst)
return module return module
} }