Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a1f641 authored by Cole Faust's avatar Cole Faust
Browse files

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
parent 337eb255

golang/golang.go

+2 −2
Original line number Diff line number Diff line
@@ -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

}