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

Commit 83b86ccc authored by Juan Yescas's avatar Juan Yescas Committed by Gerrit Code Review
Browse files

Merge "soong: ARM 32-bit targets must be built with 4k elf alignment" into main

parents 0c705a44 23cc4aa7

cc/config/arm_device.go

+1 −6
Original line number Diff line number Diff line
@@ -183,12 +183,7 @@ func init() { 
	exportedVars.ExportString("ArmClangTriple", clangTriple)



	exportedVars.ExportStringListStaticVariable("ArmLdflags", armLdflags)

	exportedVars.ExportStringList("ArmLldflags", armLldflags)

	pctx.VariableFunc("ArmLldflags", func(ctx android.PackageVarContext) string {

		maxPageSizeFlag := "-Wl,-z,max-page-size=" + ctx.Config().MaxPageSizeSupported()

		flags := append(armLldflags, maxPageSizeFlag)

		return strings.Join(flags, " ")

	})

	exportedVars.ExportStringListStaticVariable("ArmLldflags", armLldflags)



	exportedVars.ExportStringListStaticVariable("ArmFixCortexA8LdFlags", armFixCortexA8LdFlags)

	exportedVars.ExportStringListStaticVariable("ArmNoFixCortexA8LdFlags", armNoFixCortexA8LdFlags)