diff options
| author | Vilas Bhat <vilasbhat@google.com> | 2023-12-06 15:29:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 15:29:33 +0000 |
| commit | 72cdb555d675d4628e5a6854c6e12e556b74f8a5 (patch) | |
| tree | 6db41a641f28d952c5b1801e29d13fa232b24a07 | |
| parent | f82e324032f27498efdaf1340bec5ae6e83afa28 (diff) | |
| parent | a5773fbfb2fec54eddef7333944e7e2877d847b9 (diff) | |
| download | bazel-72cdb555d675d4628e5a6854c6e12e556b74f8a5.tar.gz | |
16k: bazel: Update device_page_size_agnostic to device_no_bionic_page_size_macro am: 486b97717a am: f0214f4005 am: a5773fbfb2
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2857829
Change-Id: I096703d010bec94ab8511b10c90768c561f76fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | product_config/BUILD | 2 | ||||
| -rw-r--r-- | toolchains/clang/host/linux-x86/cc_toolchain_config.bzl | 4 | ||||
| -rw-r--r-- | toolchains/clang/host/linux-x86/cc_toolchain_features.bzl | 2 |
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 |