aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVilas Bhat <vilasbhat@google.com>2023-12-04 22:52:19 +0000
committerJuan Yescas <jyescas@google.com>2023-12-05 20:39:53 +0000
commit486b97717a486b239f1c0df2c1dda3885bc2e2c7 (patch)
tree6db41a641f28d952c5b1801e29d13fa232b24a07
parentaef485b1772ae444764f49f5148cf0a52245c644 (diff)
downloadbazel-486b97717a486b239f1c0df2c1dda3885bc2e2c7.tar.gz
16k: bazel: Update device_page_size_agnostic to device_no_bionic_page_size_macro
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 Change-Id: I511a260574da49433dbe8a9b21053c9c67aa9b0d
-rw-r--r--product_config/BUILD2
-rw-r--r--toolchains/clang/host/linux-x86/cc_toolchain_config.bzl4
-rw-r--r--toolchains/clang/host/linux-x86/cc_toolchain_features.bzl2
3 files changed, 4 insertions, 4 deletions
diff --git a/product_config/BUILD b/product_config/BUILD
index 92a57bf4..974c7a88 100644
--- a/product_config/BUILD
+++ b/product_config/BUILD
@@ -77,7 +77,7 @@ _bool_variables = [
"build_broken_incorrect_partition_images",
"build_from_text_stub",
"compressed_apex",
- "device_page_size_agnostic",
+ "device_no_bionic_page_size_macro",
"enforce_vintf_manifest",
"malloc_not_svelte",
"malloc_pattern_fill_contents",
diff --git a/toolchains/clang/host/linux-x86/cc_toolchain_config.bzl b/toolchains/clang/host/linux-x86/cc_toolchain_config.bzl
index 9b334f49..9715f97e 100644
--- a/toolchains/clang/host/linux-x86/cc_toolchain_config.bzl
+++ b/toolchains/clang/host/linux-x86/cc_toolchain_config.bzl
@@ -423,8 +423,8 @@ _cc_toolchain_config = rule(
"_device_max_page_size_supported": attr.label(
default = "//build/bazel/product_config:device_max_page_size_supported",
),
- "_device_page_size_agnostic": attr.label(
- default = "//build/bazel/product_config:device_page_size_agnostic",
+ "_device_no_bionic_page_size_macro": attr.label(
+ default = "//build/bazel/product_config:device_no_bionic_page_size_macro",
),
"_clang_default_debug_level": attr.label(
default = "//build/bazel/toolchains/clang/host/linux-x86:clang_default_debug_level",
diff --git a/toolchains/clang/host/linux-x86/cc_toolchain_features.bzl b/toolchains/clang/host/linux-x86/cc_toolchain_features.bzl
index 7f41f394..2ee4da80 100644
--- a/toolchains/clang/host/linux-x86/cc_toolchain_features.bzl
+++ b/toolchains/clang/host/linux-x86/cc_toolchain_features.bzl
@@ -238,7 +238,7 @@ def _env_based_common_global_cflags(ctx):
if ctx.attr._allow_unknown_warning_option[BuildSettingInfo].value:
flags.extend(["-Wno-error=unknown-warning-option"])
- if ctx.attr._device_page_size_agnostic[BuildSettingInfo].value:
+ if ctx.attr._device_no_bionic_page_size_macro[BuildSettingInfo].value:
flags.extend(["-D__BIONIC_NO_PAGE_SIZE_MACRO"])
clang_debug_env_value = ctx.attr._clang_default_debug_level[BuildSettingInfo].value