diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:00:45 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:00:45 +0000 |
| commit | 302fb1f882361af0a88092ab2fd2fa451362e4e8 (patch) | |
| tree | 6db41a641f28d952c5b1801e29d13fa232b24a07 | |
| parent | cfa0c563d252e6a2e38151f3571ee43c49424c45 (diff) | |
| parent | d2de0a6a0cf786e2be405571548267956a957bb6 (diff) | |
| download | bazel-android14-qpr2-s1-release.tar.gz | |
Snap for 11186783 from d2de0a6a0cf786e2be405571548267956a957bb6 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I167782c62c383dc48df82093383815dc7748e96d
| -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 |