Hybrid soong/mk build using prebuilts
Change-Id: I96daa69af27bd19c8bfbe327a1318f51c738fc03
diff --git a/common/arch.go b/common/arch.go
index 4cddc00..37f7c38 100644
--- a/common/arch.go
+++ b/common/arch.go
@@ -335,6 +335,7 @@
HostSupported
DeviceSupported
HostAndDeviceSupported
+ HostAndDeviceDefault
)
type HostOrDevice int
@@ -505,16 +506,11 @@
return
}
- hostArches, deviceArches, err := decodeArchProductVariables(mctx.Config().(Config).ProductVariables)
- if err != nil {
- mctx.ModuleErrorf("%s", err.Error())
- }
-
moduleArches := []Arch{}
multilib := module.base().commonProperties.Compile_multilib
if module.base().HostSupported() && module.base().HostOrDevice().Host() {
- hostModuleArches, err := decodeMultilib(multilib, hostArches[module.base().HostType()])
+ hostModuleArches, err := decodeMultilib(multilib, mctx.Config().(Config).HostArches[module.base().HostType()])
if err != nil {
mctx.ModuleErrorf("%s", err.Error())
}
@@ -523,7 +519,7 @@
}
if module.base().DeviceSupported() && module.base().HostOrDevice().Device() {
- deviceModuleArches, err := decodeMultilib(multilib, deviceArches)
+ deviceModuleArches, err := decodeMultilib(multilib, mctx.Config().(Config).DeviceArches)
if err != nil {
mctx.ModuleErrorf("%s", err.Error())
}