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

Commit 2a481368 authored by Steven Moreland's avatar Steven Moreland
Browse files

Use __BIONIC_DEPRECATED_PAGE_SIZE_MACRO. 

The default compilation behavior is set to be the future direction,
and a flag is set for backwards compatibility.

Bug: 312546062
Test: build/boot
Change-Id: Ibf87cbb2ab5da8640bcf7eb5f8cd643bf500e2e5
parent afacc090

cc/config/arm64_device.go

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ func init() { 
	exportedVars.ExportStringList("Arm64Cflags", arm64Cflags)

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

		flags := arm64Cflags

		if ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")

		if !ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")

		}

		return strings.Join(flags, " ")

	})

cc/config/x86_64_device.go

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ func init() { 
	exportedVars.ExportStringList("X86_64Cflags", x86_64Cflags)

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

		flags := x86_64Cflags

		if ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")

		if !ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_DEPRECATED_PAGE_SIZE_MACRO")

		}

		return strings.Join(flags, " ")

	})