diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:44:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:44:34 +0000 |
| commit | 8e863c7745e0f62bdd0a5a9e0eb16451eb8d5fe3 (patch) | |
| tree | 8caf14bdd2828bc3557b30c2ab845618d56c4d1f | |
| parent | 27a59835afa7928b2c07ca4254d806648d4a5fc9 (diff) | |
| parent | 2bdbb880af12c9df5f18862ba4ffbebbd0cb2115 (diff) | |
| download | bazel-simpleperf-release.tar.gz | |
Snap for 11400057 from 2bdbb880af12c9df5f18862ba4ffbebbd0cb2115 to simpleperf-releasesimpleperf-release
Change-Id: Ic28545c8db3254402fb09f6b665b42a47d3ecd70
| -rwxr-xr-x | bin/printflags | 2 | ||||
| -rw-r--r-- | common.bazelrc | 3 | ||||
| -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 |
5 files changed, 8 insertions, 5 deletions
diff --git a/bin/printflags b/bin/printflags index 367886c5..feea76ab 100755 --- a/bin/printflags +++ b/bin/printflags @@ -22,4 +22,4 @@ if [[ ! -f "$aconfig" || ! -f "$flags_file" ]]; then echo "Missing dependencies: please run 'm all_aconfig_declarations' and try again." exit 1 fi -$aconfig dump --cache $flags_file $@ +$aconfig dump-cache --cache "$flags_file" "$@" diff --git a/common.bazelrc b/common.bazelrc index 67ac32eb..0b2d1d66 100644 --- a/common.bazelrc +++ b/common.bazelrc @@ -24,6 +24,9 @@ common --experimental_enable_scl_dialect common --experimental_cc_shared_library build --experimental_starlark_cc_import +# Do not enable BzlMod as the migration to bzlmod has not been done yet +common --noenable_bzlmod + # Do not tokenize copts, other than strings that consist of a single Make # variable. This prevents the need to double-escape characters like backslashes # and quotes in copts. 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 |