From 4f644da0ad7c2ff648733b43d59b19b8593195a4 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 10 Oct 2018 17:18:08 -0700 Subject: [PATCH] Don't use arch-specific modules when we want a single module 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 --- cc/ndk_headers.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go index 1cd48296c..cdf63d84c 100644 --- a/cc/ndk_headers.go +++ b/cc/ndk_headers.go @@ -278,11 +278,7 @@ func versionedNdkHeadersFactory() android.Module { 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. - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidModule(module) return module } @@ -362,11 +358,7 @@ func preprocessedNdkHeadersFactory() android.Module { 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. - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidModule(module) return module }