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

Commit 3ad4cf3a authored by Vilas Bhat's avatar Vilas Bhat Committed by Gerrit Code Review
Browse files

Merge "16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro" into main

parents fb510be8 b3d2d22a

android/config.go

+6 −4
Original line number Diff line number Diff line
@@ -195,10 +195,12 @@ func (c Config) MaxPageSizeSupported() string { 
	return String(c.config.productVariables.DeviceMaxPageSizeSupported)

}



// PageSizeAgnostic returns true when AOSP is page size agnostic,

// othersise it returns false.

func (c Config) PageSizeAgnostic() bool {

	return Bool(c.config.productVariables.DevicePageSizeAgnostic)

// NoBionicPageSizeMacro returns true when AOSP is page size agnostic.

// This means that the bionic's macro PAGE_SIZE won't be defined.

// Returns false when AOSP is NOT page size agnostic.

// This means that bionic's macro PAGE_SIZE is defined.

func (c Config) NoBionicPageSizeMacro() bool {

	return Bool(c.config.productVariables.DeviceNoBionicPageSizeMacro)

}



// The release version passed to aconfig, derived from RELEASE_VERSION

android/variable.go

+15 −15
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ type ProductVariables struct { 
	DeviceCurrentApiLevelForVendorModules *string  `json:",omitempty"`

	DeviceSystemSdkVersions               []string `json:",omitempty"`

	DeviceMaxPageSizeSupported            *string  `json:",omitempty"`

	DevicePageSizeAgnostic                *bool    `json:",omitempty"`

	DeviceNoBionicPageSizeMacro           *bool    `json:",omitempty"`



	VendorApiLevel *string `json:",omitempty"`
@@ -595,7 +595,7 @@ func (v *ProductVariables) SetDefaultConfig() { 
		DeviceSecondaryCpuVariant:   stringPtr("generic"),

		DeviceSecondaryAbi:          []string{"armeabi-v7a", "armeabi"},

		DeviceMaxPageSizeSupported:  stringPtr("4096"),

		DevicePageSizeAgnostic:     boolPtr(false),

		DeviceNoBionicPageSizeMacro: boolPtr(false),



		AAPTConfig:          []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},

		AAPTPreferredConfig: stringPtr("xhdpi"),

bp2build/bp2build_product_config.go

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ func platformMappingSingleProduct( 
		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_abi=%s\n", strings.Join(productVariables.DeviceAbi, ",")))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_max_page_size_supported=%s\n", proptools.String(productVariables.DeviceMaxPageSizeSupported)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_name=%s\n", proptools.String(productVariables.DeviceName)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_page_size_agnostic=%t\n", proptools.Bool(productVariables.DevicePageSizeAgnostic)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_no_bionic_page_size_macro=%t\n", proptools.Bool(productVariables.DeviceNoBionicPageSizeMacro)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_product=%s\n", proptools.String(productVariables.DeviceProduct)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:device_platform=%s\n", label.String()))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:enable_cfi=%t\n", proptools.BoolDefault(productVariables.EnableCFI, true)))

cc/config/arm64_device.go

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

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

		flags := arm64Cflags

		if ctx.Config().PageSizeAgnostic() {

		if ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")

		}

		return strings.Join(flags, " ")

cc/config/x86_64_device.go

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ func init() { 
	exportedVars.ExportStringList("X86_64Cflags", x86_64Cflags)

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

		flags := x86_64Cflags

		if ctx.Config().PageSizeAgnostic() {

		if ctx.Config().NoBionicPageSizeMacro() {

			flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")

		}

		return strings.Join(flags, " ")