Remove final usages of product_vars_providing_rule am: 68f2dd9d06
Original change: https://android-review.googlesource.com/c/platform/prebuilts/clang/host/linux-x86/+/2693195
Change-Id: Iebb3701f28dd5740447f480e3afc5a5e78696ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
index a74cedd..6b42ad0 100644
--- a/cc_toolchain_config.bzl
+++ b/cc_toolchain_config.bzl
@@ -413,8 +413,8 @@
"_allow_unknown_warning_option": attr.label(
default = "//prebuilts/clang/host/linux-x86:allow_unknown_warning_option_env",
),
- "_product_variables": attr.label(
- default = "//build/bazel/product_config:product_vars",
+ "_device_max_page_size_supported": attr.label(
+ default = "//build/bazel/product_config:device_max_page_size_supported",
),
"_clang_default_debug_level": attr.label(
default = "//prebuilts/clang/host/linux-x86:clang_default_debug_level",
diff --git a/cc_toolchain_features.bzl b/cc_toolchain_features.bzl
index 5b95e3a..9b5cc15 100644
--- a/cc_toolchain_features.bzl
+++ b/cc_toolchain_features.bzl
@@ -13,7 +13,6 @@
"variable_with_value",
"with_feature_set",
)
-load("//build/bazel/product_config:product_variables_providing_rule.bzl", "ProductVariablesInfo")
load(
":cc_toolchain_constants.bzl",
_actions = "actions",
@@ -2180,7 +2179,7 @@
target_flags = ctx.attr.target_flags
compile_only_flags = ctx.attr.compiler_flags
linker_only_flags = ctx.attr.linker_flags
- deviceMaxPageSize = ctx.attr._product_variables[ProductVariablesInfo].DeviceMaxPageSizeSupported
+ deviceMaxPageSize = ctx.attr._device_max_page_size_supported[BuildSettingInfo].value
if deviceMaxPageSize and (target_arch == "arm" or target_arch == "arm64"):
linker_only_flags = ctx.attr.linker_flags + \
["-Wl,-z,max-page-size=" + deviceMaxPageSize]
