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

Commit 2d295a2d authored by Colin Cross's avatar Colin Cross
Browse files

Add musl_x86 and glibc_x86 style properties to bazel configurations 

Bug: 223257095
Test: build/bazel/ci/mixed_libc.sh
Change-Id: Ia2427f54cdaafc657e29a7ae7a7575bec2b71338
parent cb59ea7b

android/arch.go

+10 −0
Original line number Diff line number Diff line
@@ -2179,6 +2179,16 @@ func (m *ModuleBase) GetArchVariantProperties(ctx ArchVariantContext, propertySe 
				targetStructs := getTargetStructs(ctx, archProperties, targetField)

				osArchStructs = append(osArchStructs, targetStructs...)

			}

			if os == LinuxMusl {

				targetField := "Musl_" + arch.Name

				targetStructs := getTargetStructs(ctx, archProperties, targetField)

				osArchStructs = append(osArchStructs, targetStructs...)

			}

			if os == Linux {

				targetField := "Glibc_" + arch.Name

				targetStructs := getTargetStructs(ctx, archProperties, targetField)

				osArchStructs = append(osArchStructs, targetStructs...)

			}



			targetField := GetCompoundTargetField(os, arch)

			targetName := fmt.Sprintf("%s_%s", os.Name, arch.Name)