From b3d2d22a5d3b2369705081088c6147e697eaad4e Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 4 Dec 2023 22:51:20 +0000 Subject: [PATCH] 16k: soong: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro This is part of a larger change to update the flag PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO. This is to help clarify that this flag doesn't mean the device will actually work end-to-end with any page size. Bug: 312541564 Test: ``` source build/envsetup.sh lunch aosp_cf_arm64_phone_pgagnostic-trunk-userdebug m cat out/soong/build.aosp_cf_arm64_phone_pgagnostic.ninja | grep __BIONIC_NO_PAGE_SIZE_MACRO ``` Change-Id: I33033876d0d4a276d1bb962d40315b71a3968c66 --- android/config.go | 10 ++++++---- android/variable.go | 30 ++++++++++++++--------------- bp2build/bp2build_product_config.go | 2 +- cc/config/arm64_device.go | 2 +- cc/config/x86_64_device.go | 2 +- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/android/config.go b/android/config.go index a9fcca5ad..22f17bbbf 100644 --- a/android/config.go +++ b/android/config.go @@ -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 diff --git a/android/variable.go b/android/variable.go index f4c6e1cd2..aecad3b84 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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"` @@ -582,20 +582,20 @@ func (v *ProductVariables) SetDefaultConfig() { Platform_version_all_preview_codenames: []string{"S"}, Platform_vndk_version: stringPtr("S"), - HostArch: stringPtr("x86_64"), - HostSecondaryArch: stringPtr("x86"), - DeviceName: stringPtr("generic_arm64"), - DeviceProduct: stringPtr("aosp_arm-eng"), - DeviceArch: stringPtr("arm64"), - DeviceArchVariant: stringPtr("armv8-a"), - DeviceCpuVariant: stringPtr("generic"), - DeviceAbi: []string{"arm64-v8a"}, - DeviceSecondaryArch: stringPtr("arm"), - DeviceSecondaryArchVariant: stringPtr("armv8-a"), - DeviceSecondaryCpuVariant: stringPtr("generic"), - DeviceSecondaryAbi: []string{"armeabi-v7a", "armeabi"}, - DeviceMaxPageSizeSupported: stringPtr("4096"), - DevicePageSizeAgnostic: boolPtr(false), + HostArch: stringPtr("x86_64"), + HostSecondaryArch: stringPtr("x86"), + DeviceName: stringPtr("generic_arm64"), + DeviceProduct: stringPtr("aosp_arm-eng"), + DeviceArch: stringPtr("arm64"), + DeviceArchVariant: stringPtr("armv8-a"), + DeviceCpuVariant: stringPtr("generic"), + DeviceAbi: []string{"arm64-v8a"}, + DeviceSecondaryArch: stringPtr("arm"), + DeviceSecondaryArchVariant: stringPtr("armv8-a"), + DeviceSecondaryCpuVariant: stringPtr("generic"), + DeviceSecondaryAbi: []string{"armeabi-v7a", "armeabi"}, + DeviceMaxPageSizeSupported: stringPtr("4096"), + DeviceNoBionicPageSizeMacro: boolPtr(false), AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"}, AAPTPreferredConfig: stringPtr("xhdpi"), diff --git a/bp2build/bp2build_product_config.go b/bp2build/bp2build_product_config.go index 0d1e433e9..4c09d6728 100644 --- a/bp2build/bp2build_product_config.go +++ b/bp2build/bp2build_product_config.go @@ -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))) diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 12722a7de..82beb293e 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -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, " ") diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go index 00a395f78..e43848cc9 100644 --- a/cc/config/x86_64_device.go +++ b/cc/config/x86_64_device.go @@ -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, " ")