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

Commit c4d11bc4 authored by Alex Márquez Pérez Muñíz Díaz Púras Thaureaux's avatar Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
Browse files

Export all constants for `linux_bionic` 

They need to be referenced in adding a `linux_bionic` Bazel cc_toolchain

Test: CI
Bug: 205771732
Change-Id: I5469eac5559cdf76e02fdeccaf496e5ffcc1b08e
parent bdb7495f

cc/config/arm64_linux_host.go

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ var ( 
)



func init() {

	pctx.StaticVariable("LinuxBionicArm64Cflags", strings.Join(linuxCrossCflags, " "))

	pctx.StaticVariable("LinuxBionicArm64Ldflags", strings.Join(linuxCrossLdflags, " "))

	exportedVars.ExportStringListStaticVariable("LinuxBionicArm64Cflags", linuxCrossCflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicArm64Ldflags", linuxCrossLdflags)

}



// toolchain config for ARM64 Linux CrossHost. Almost everything is the same as the ARM64 Android

cc/config/x86_linux_bionic_host.go

+5 −8
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
package config



import (

	"strings"



	"android/soong/android"

)
@@ -71,14 +69,13 @@ const ( 
)



func init() {



	pctx.StaticVariable("LinuxBionicCflags", strings.Join(linuxBionicCflags, " "))

	pctx.StaticVariable("LinuxBionicLdflags", strings.Join(linuxBionicLdflags, " "))

	pctx.StaticVariable("LinuxBionicLldflags", strings.Join(linuxBionicLdflags, " "))

	exportedVars.ExportStringListStaticVariable("LinuxBionicCflags", linuxBionicCflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicLdflags", linuxBionicLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicLldflags", linuxBionicLdflags)



	// Use the device gcc toolchain for now

	pctx.StaticVariable("LinuxBionicGccVersion", x86_64GccVersion)

	pctx.SourcePathVariable("LinuxBionicGccRoot",

	exportedVars.ExportStringStaticVariable("LinuxBionicGccVersion", x86_64GccVersion)

	exportedVars.ExportSourcePathVariable("LinuxBionicGccRoot",

		"prebuilts/gcc/${HostPrebuiltTag}/x86/x86_64-linux-android-${LinuxBionicGccVersion}")

}