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

Commit ba19a4b2 authored by Vinh Tran's avatar Vinh Tran Committed by Automerger Merge Worker
Browse files

Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894c am: 3ce3a959 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509



Change-Id: I6f4b8a92784d4b1d692f5c537554376ee5e64710
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f92c64d 3ce3a959

rust/config/arm_device.go

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ func init() { 
			strings.Join(rustFlags, " "))

	}



	ExportedVars.ExportStringListStaticVariable("DEVICE_ARM_RUSTC_FLAGS", ArmRustFlags)

}



type toolchainArm struct {

rust/config/x86_64_device.go

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ func init() { 
		pctx.StaticVariable("X86_64"+variant+"VariantRustFlags",

			strings.Join(rustFlags, " "))

	}



	ExportedVars.ExportStringListStaticVariable("DEVICE_X86_64_RUSTC_FLAGS", x86_64RustFlags)

}



type toolchainX86_64 struct {

rust/config/x86_device.go

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ func init() { 
			strings.Join(rustFlags, " "))

	}



	ExportedVars.ExportStringListStaticVariable("DEVICE_X86_RUSTC_FLAGS", x86RustFlags)

}



type toolchainX86 struct {