From f7a1f6418ce3fa6b5685ab97cf76d5f9c94e5c14 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 28 Oct 2024 10:38:46 -0700 Subject: Support host-cross variant on golang modules This doesn't actually add support for cross-compiling go modules, even when built on the cross-compile variant, the results will still just be built for the current host. However, it does make the variants of golang modules match up better with other host tools that are being built for a cross-compile variant. Bug: 369916167 Test: m nothing on aosp_cf_arm64_only_phone with aosp/3318965 Change-Id: I2245d09d2cfc9bcfb819d678cdae541dd87a441d --- golang/golang.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'golang/golang.go') diff --git a/golang/golang.go b/golang/golang.go index 6ee924f1d..d33f5e050 100644 --- a/golang/golang.go +++ b/golang/golang.go @@ -47,7 +47,7 @@ type GoPackage struct { func goPackageModuleFactory() android.Module { module := &GoPackage{} module.AddProperties(module.Properties()...) - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst) return module } @@ -74,7 +74,7 @@ type GoBinary struct { func goBinaryModuleFactory() android.Module { module := &GoBinary{} module.AddProperties(module.Properties()...) - android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibFirst) + android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst) return module } -- cgit v1.2.3-59-g8ed1b