diff options
| author | Cole Faust <colefaust@google.com> | 2023-03-08 18:21:17 -0800 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2023-03-08 18:23:59 -0800 |
| commit | a3fca5cbd0829d92a968bca42e8597764312f89f (patch) | |
| tree | df18b41ea24b49b807752acbd8a440c3abb8fed5 | |
| parent | 60845a5d40a25e95556f0de1ca2cfccaf98ddfaa (diff) | |
| download | bazel-a3fca5cbd0829d92a968bca42e8597764312f89f.tar.gz | |
Enable and fix load-related buildifier lints
Bug: 271709362
Test: Presubmits
Change-Id: Ib11f83b98258c871c121f5a3b03fb59c8d9bbf25
68 files changed, 119 insertions, 151 deletions
diff --git a/buildifier_hook.sh b/buildifier_hook.sh index 0f52c832..0e75abe1 100755 --- a/buildifier_hook.sh +++ b/buildifier_hook.sh @@ -1,2 +1,2 @@ #!/bin/bash -[[ ! $(command -v buildifier) ]] || buildifier -mode=check `printf "%s\n" $@ | grep -E "^(BUILD|BUILD.bazel|bazel.WORKSPACE|.*\\.bzl)$"` < /dev/null +[[ ! $(command -v buildifier) ]] || buildifier -mode=check -lint=warn -warnings="out-of-order-load,load-on-top,load" `printf "%s\n" $@ | grep -E "^(BUILD|BUILD.bazel|bazel.WORKSPACE|.*\\.bzl)$"` < /dev/null diff --git a/examples/android_app/java/com/app/BUILD b/examples/android_app/java/com/app/BUILD index d4d6b922..5ee50df3 100644 --- a/examples/android_app/java/com/app/BUILD +++ b/examples/android_app/java/com/app/BUILD @@ -1,6 +1,6 @@ load("//build/bazel/rules/android:rules.bzl", "android_binary", "android_library") -load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") +load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") android_binary( name = "app", diff --git a/examples/cc/aidl_library/BUILD b/examples/cc/aidl_library/BUILD index f1de036e..9e08dea3 100644 --- a/examples/cc/aidl_library/BUILD +++ b/examples/cc/aidl_library/BUILD @@ -1,8 +1,8 @@ # This BUILD file mimics what bp2build will convert cc modules with aidl srcs to load("//build/bazel/rules/cc:cc_aidl_library.bzl", "cc_aidl_library") +load("//build/bazel/rules/cc:cc_binary.bzl", "cc_binary") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") -load("//build/bazel/rules/cc:cc_binary.bzl", "cc_binary") # Use aidl sources from another package cc_aidl_library( diff --git a/examples/cc/proto/deps/BUILD b/examples/cc/proto/deps/BUILD index f6edc137..bdcb56bf 100644 --- a/examples/cc/proto/deps/BUILD +++ b/examples/cc/proto/deps/BUILD @@ -3,4 +3,4 @@ package(default_visibility = ["//visibility:public"]) proto_library( name = "deps_proto", srcs = glob(["src/**/*.proto"]), -)
\ No newline at end of file +) diff --git a/platforms/product_variables/product_platform.bzl b/platforms/product_variables/product_platform.bzl index 1f807a6c..14d11532 100644 --- a/platforms/product_variables/product_platform.bzl +++ b/platforms/product_variables/product_platform.bzl @@ -1,7 +1,5 @@ """Parallels variable.go to provide variables and create a platform based on converted config.""" -load("@soong_injection//product_config:product_variables.bzl", "product_vars") -load("//build/bazel/product_variables:constants.bzl", "constants") load("//build/bazel/platforms/arch/variants:constants.bzl", _arch_constants = "constants") def _product_variables_providing_rule_impl(ctx): diff --git a/product_config/utils.bzl b/product_config/utils.bzl index e9090fdb..3a6c9249 100644 --- a/product_config/utils.bzl +++ b/product_config/utils.bzl @@ -1,6 +1,6 @@ -load("//build/bazel/product_variables:constants.bzl", "constants") load("@//build/bazel/platforms:product_variables/product_platform.bzl", "determine_target_arches_from_config", "product_variables_providing_rule") load("@//build/bazel/platforms/arch/variants:constants.bzl", _variant_constants = "constants") +load("//build/bazel/product_variables:constants.bzl", "constants") load( "//prebuilts/clang/host/linux-x86:cc_toolchain_constants.bzl", "arch_to_variants", diff --git a/product_variables/constants.bzl b/product_variables/constants.bzl index 3fa0b35b..5405afaa 100644 --- a/product_variables/constants.bzl +++ b/product_variables/constants.bzl @@ -1,16 +1,16 @@ """Constants for product variables based on information in variable.go""" load( + "@soong_injection//product_config:product_variables.bzl", + _arch_variant_product_var_constraints = "arch_variant_product_var_constraints", + _product_var_constraints = "product_var_constraints", +) +load( "@soong_injection//product_config:soong_config_variables.bzl", _soong_config_bool_variables = "soong_config_bool_variables", _soong_config_string_variables = "soong_config_string_variables", _soong_config_value_variables = "soong_config_value_variables", ) -load( - "@soong_injection//product_config:product_variables.bzl", - _arch_variant_product_var_constraints = "arch_variant_product_var_constraints", - _product_var_constraints = "product_var_constraints", -) _soong_config_variables = _soong_config_bool_variables.keys() + \ _soong_config_string_variables.keys() + \ diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel index b57b7887..f5c99b77 100644 --- a/rules/BUILD.bazel +++ b/rules/BUILD.bazel @@ -1,7 +1,7 @@ load(":gensrcs_test.bzl", "gensrcs_tests_suite") load(":linker_config_test.bzl", "linker_config_test_suite") -load(":prebuilt_xml_test.bzl", "prebuilt_xml_test_suite") load(":prebuilt_file_test.bzl", "prebuilt_file_test_suite") +load(":prebuilt_xml_test.bzl", "prebuilt_xml_test_suite") exports_files(["lunch.bzl"]) diff --git a/rules/abi/abi_dump.bzl b/rules/abi/abi_dump.bzl index 52f451c9..1dddd05d 100644 --- a/rules/abi/abi_dump.bzl +++ b/rules/abi/abi_dump.bzl @@ -12,6 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") +load( + "@bazel_tools//tools/build_defs/cc:action_names.bzl", + "CPP_COMPILE_ACTION_NAME", + "C_COMPILE_ACTION_NAME", +) +load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/platforms:platform_utils.bzl", "platforms") load( "//build/bazel/rules/cc:cc_library_common.bzl", @@ -22,15 +30,6 @@ load( "parse_apex_sdk_version", ) load("//build/bazel/rules/cc:cc_library_static.bzl", "CcStaticLibraryInfo") -load("@soong_injection//product_config:product_variables.bzl", "product_vars") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") -load( - "@bazel_tools//tools/build_defs/cc:action_names.bzl", - "CPP_COMPILE_ACTION_NAME", - "C_COMPILE_ACTION_NAME", -) -load("@bazel_skylib//lib:paths.bzl", "paths") -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") AbiDumpInfo = provider(fields = ["dump_files"]) AbiDiffInfo = provider(fields = ["diff_files"]) diff --git a/rules/abi/abi_dump_test.bzl b/rules/abi/abi_dump_test.bzl index 613f173d..d13cd66f 100644 --- a/rules/abi/abi_dump_test.bzl +++ b/rules/abi/abi_dump_test.bzl @@ -15,15 +15,10 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:sets.bzl", "sets") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load(":abi_dump.bzl", "abi_dump", "find_abi_config") -load("//build/bazel/platforms:platform_utils.bzl", "platforms") -load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") -load("//build/bazel/rules/cc:cc_library_common.bzl", "parse_apex_sdk_version") -load("//build/bazel/rules/test_common:rules.bzl", "expect_failure_test") +load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/test_common:args.bzl", "get_arg_value", "get_arg_values") -load("@soong_injection//product_config:product_variables.bzl", "product_vars") +load(":abi_dump.bzl", "abi_dump", "find_abi_config") ABI_LINKER = "prebuilts/clang-tools/linux-x86/bin/header-abi-linker" ABI_DIFF = "prebuilts/clang-tools/linux-x86/bin/header-abi-diff" diff --git a/rules/aidl/BUILD b/rules/aidl/BUILD index ee090e73..1917154d 100644 --- a/rules/aidl/BUILD +++ b/rules/aidl/BUILD @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -load(":library_test.bzl", "aidl_library_test_suite") load(":interface_test.bzl", "aidl_interface_test_suite") +load(":library_test.bzl", "aidl_library_test_suite") aidl_library_test_suite(name = "aidl_library_tests") diff --git a/rules/aidl/interface.bzl b/rules/aidl/interface.bzl index 4224102c..cbe6fb63 100644 --- a/rules/aidl/interface.bzl +++ b/rules/aidl/interface.bzl @@ -13,10 +13,10 @@ # limitations under the License. load("//build/bazel/rules/aidl:library.bzl", "aidl_library") -load("//build/bazel/rules/java:aidl_library.bzl", "java_aidl_library") load("//build/bazel/rules/cc:cc_aidl_code_gen.bzl", "cc_aidl_code_gen") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") +load("//build/bazel/rules/java:aidl_library.bzl", "java_aidl_library") JAVA = "java" CPP = "cpp" diff --git a/rules/aidl/interface_test.bzl b/rules/aidl/interface_test.bzl index 25a8c6ba..7dd3638f 100644 --- a/rules/aidl/interface_test.bzl +++ b/rules/aidl/interface_test.bzl @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. """ -load("//build/bazel/rules/aidl:interface.bzl", "aidl_interface") -load("//build/bazel/rules/test_common:rules.bzl", "target_under_test_exist_test") load("@bazel_skylib//lib:new_sets.bzl", "sets") -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") +load("//build/bazel/rules/aidl:interface.bzl", "aidl_interface") +load("//build/bazel/rules/test_common:rules.bzl", "target_under_test_exist_test") def _ndk_backend_test_impl(ctx): env = analysistest.begin(ctx) diff --git a/rules/android/android_app_keystore.bzl b/rules/android/android_app_keystore.bzl index 4500448f..156dde5c 100644 --- a/rules/android/android_app_keystore.bzl +++ b/rules/android/android_app_keystore.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:paths.bzl", "paths") load("android_app_certificate.bzl", "AndroidAppCertificateInfo") AndroidAppKeystoreInfo = provider( diff --git a/rules/android/android_library.bzl b/rules/android/android_library.bzl index 8f52d291..d8239c7c 100644 --- a/rules/android/android_library.bzl +++ b/rules/android/android_library.bzl @@ -1,11 +1,5 @@ """android_library rule.""" -load("@rules_kotlin//kotlin:common.bzl", _kt_common = "common") -load("@rules_kotlin//kotlin:compiler_opt.bzl", "merge_kotlincopts") -load("@rules_kotlin//kotlin:jvm_compile.bzl", "kt_jvm_compile") -load("@rules_kotlin//kotlin:traverse_exports.bzl", _kt_traverse_exports = "kt_traverse_exports") -load("@rules_kotlin//toolchains/kotlin_jvm:kt_jvm_toolchains.bzl", _kt_jvm_toolchains = "kt_jvm_toolchains") -load("@rules_android//rules:acls.bzl", _acls = "acls") load( "@rules_android//rules:attrs.bzl", _attrs = "attrs", @@ -23,7 +17,7 @@ load( "ProviderInfo", "processing_pipeline", ) -load("@rules_android//rules:utils.bzl", "get_android_toolchain", "utils") +load("@rules_android//rules:utils.bzl", "utils") load( "@rules_android//rules/android_library:attrs.bzl", _BASE_ATTRS = "ATTRS", @@ -38,8 +32,12 @@ load( _attrs_metadata = "attrs_metadata", _make_rule = "make_rule", ) -load("@rules_android//rules:providers.bzl", "AndroidLintRulesInfo") +load("@rules_kotlin//kotlin:common.bzl", _kt_common = "common") +load("@rules_kotlin//kotlin:compiler_opt.bzl", "merge_kotlincopts") load("@rules_kotlin//kotlin:compiler_opt.bzl", "kotlincopts_attrs") +load("@rules_kotlin//kotlin:jvm_compile.bzl", "kt_jvm_compile") +load("@rules_kotlin//kotlin:traverse_exports.bzl", _kt_traverse_exports = "kt_traverse_exports") +load("@rules_kotlin//toolchains/kotlin_jvm:kt_jvm_toolchains.bzl", _kt_jvm_toolchains = "kt_jvm_toolchains") KT_COMPILER_ATTRS = _attrs.add( kotlincopts_attrs(), diff --git a/rules/android/rules.bzl b/rules/android/rules.bzl index 22da11d0..99c46c94 100644 --- a/rules/android/rules.bzl +++ b/rules/android/rules.bzl @@ -23,14 +23,6 @@ load( _android_application = "android_application", ) load( - ":android_binary.bzl", - _android_binary = "android_binary", -) -load( - ":android_library.bzl", - _android_library = "android_library_macro", -) -load( "@rules_android//rules:rules.bzl", _android_ndk_repository = "android_ndk_repository", ) @@ -50,6 +42,14 @@ load( ":android_app_certificate.bzl", _android_app_certificate = "android_app_certificate", ) +load( + ":android_binary.bzl", + _android_binary = "android_binary", +) +load( + ":android_library.bzl", + _android_library = "android_library_macro", +) aar_import = _aar_import android_application = _android_application diff --git a/rules/apex/BUILD b/rules/apex/BUILD index af12f02c..04b7d60e 100644 --- a/rules/apex/BUILD +++ b/rules/apex/BUILD @@ -1,14 +1,14 @@ +load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "bool_setting", "string_list_setting", "string_setting") +load("@env//:env.bzl", "env") +load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/flags:common.bzl", "is_env_true") load("//build/bazel/product_variables:constants.bzl", "constants") load("//build/bazel/rules/apex:toolchain.bzl", "apex_toolchain") -load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "bool_setting", "string_list_setting", "string_setting") -load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/rules/common:api.bzl", api_levels = "api_levels_with_previews") load(":apex.bzl", "compression_enabled") -load(":apex_test.bzl", "apex_test_suite") load(":apex_aab_test.bzl", "apex_aab_test_suite") load(":apex_key_test.bzl", "apex_key_test_suite") -load("@env//:env.bzl", "env") +load(":apex_test.bzl", "apex_test_suite") string_setting( name = "apex_name", diff --git a/rules/apex/cc.bzl b/rules/apex/cc.bzl index 72b131ce..2962f446 100644 --- a/rules/apex/cc.bzl +++ b/rules/apex/cc.bzl @@ -13,7 +13,6 @@ # limitations under the License. load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/rules/cc:cc_library_common.bzl", "parse_apex_sdk_version") load("//build/bazel/rules/cc:cc_library_shared.bzl", "CcStubLibrariesInfo") load("//build/bazel/rules/cc:cc_stub_library.bzl", "CcStubLibrarySharedInfo") diff --git a/rules/apis/BUILD b/rules/apis/BUILD index d316a796..17844111 100644 --- a/rules/apis/BUILD +++ b/rules/apis/BUILD @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -load(":cc_api_contribution_test.bzl", "cc_api_test_suite") load(":api_domain_test.bzl", "api_domain_test_suite") +load(":cc_api_contribution_test.bzl", "cc_api_test_suite") cc_api_test_suite(name = "cc_api_test_suite") diff --git a/rules/apis/api_domain_test.bzl b/rules/apis/api_domain_test.bzl index 4bc16808..c28b2d4c 100644 --- a/rules/apis/api_domain_test.bzl +++ b/rules/apis/api_domain_test.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load(":api_domain.bzl", "api_domain") load(":cc_api_contribution.bzl", "cc_api_contribution") load(":java_api_contribution.bzl", "java_api_contribution") diff --git a/rules/apis/cc_api_contribution_test.bzl b/rules/apis/cc_api_contribution_test.bzl index be01ad58..e9aba9b1 100644 --- a/rules/apis/cc_api_contribution_test.bzl +++ b/rules/apis/cc_api_contribution_test.bzl @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load(":cc_api_contribution.bzl", "CcApiContributionInfo", "CcApiHeaderInfo", "CcApiHeaderInfoList", "cc_api_contribution", "cc_api_headers", "cc_api_library_headers") def _empty_include_dir_test_impl(ctx): diff --git a/rules/bpf/bpf.bzl b/rules/bpf/bpf.bzl index cf11ffd3..c241d0dd 100644 --- a/rules/bpf/bpf.bzl +++ b/rules/bpf/bpf.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") def _get_clang_cmd_output(ctx): copts = [ diff --git a/rules/cc/BUILD.bazel b/rules/cc/BUILD.bazel index 105f7bdb..48c96c28 100644 --- a/rules/cc/BUILD.bazel +++ b/rules/cc/BUILD.bazel @@ -13,23 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. """ +load("@bazel_skylib//lib:selects.bzl", "selects") load(":cc_aidl_library_test.bzl", "cc_aidl_library_test_suite") load(":cc_binary_test.bzl", "cc_binary_test_suite") -load(":cc_test_test.bzl", "cc_test_test_suite") load(":cc_hidl_library_test.bzl", "cc_hidl_library_test_suite") load(":cc_library_common_test.bzl", "cc_library_common_test_suites") load(":cc_library_shared_test.bzl", "cc_library_shared_test_suite") load(":cc_library_static_test.bzl", "cc_library_static_test_suite") -load(":lto_transitions_test.bzl", "lto_transition_test_suite") load(":cc_object_test.bzl", "cc_object_test_suite") +load(":cc_prebuilt_binary_test.bzl", "cc_prebuilt_binary_test_suite") load(":cc_proto_test.bzl", "cc_proto_test_suite") load(":cc_sysprop_library_test.bzl", "cc_gen_sysprop_test_suite") -load(":cc_prebuilt_binary_test.bzl", "cc_prebuilt_binary_test_suite") +load(":cc_test_test.bzl", "cc_test_test_suite") load(":clang_tidy_test.bzl", "clang_tidy_test_suite") load(":flex_test.bzl", "flex_test_suite") +load(":lto_transitions_test.bzl", "lto_transition_test_suite") load(":stl_test.bzl", "stl_test_suite") load(":yasm_test.bzl", "yasm_test_suite") -load("@bazel_skylib//lib:selects.bzl", "selects") config_setting( name = "coverage_lib_flag", diff --git a/rules/cc/cc_aidl_code_gen.bzl b/rules/cc/cc_aidl_code_gen.bzl index e6bb3e2c..ca579eaa 100644 --- a/rules/cc/cc_aidl_code_gen.bzl +++ b/rules/cc/cc_aidl_code_gen.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/rules/aidl:library.bzl", "AidlGenInfo") load("@bazel_skylib//lib:paths.bzl", "paths") +load("//build/bazel/rules/aidl:library.bzl", "AidlGenInfo") load(":cc_library_common.bzl", "create_ccinfo_for_includes") _SOURCES = "sources" diff --git a/rules/cc/cc_aidl_library.bzl b/rules/cc/cc_aidl_library.bzl index ed31cb75..297e1868 100644 --- a/rules/cc/cc_aidl_library.bzl +++ b/rules/cc/cc_aidl_library.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/cc:cc_aidl_code_gen.bzl", "cc_aidl_code_gen") +load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") def cc_aidl_library( name, diff --git a/rules/cc/cc_aidl_library_test.bzl b/rules/cc/cc_aidl_library_test.bzl index 9ecadf89..c4098915 100644 --- a/rules/cc/cc_aidl_library_test.bzl +++ b/rules/cc/cc_aidl_library_test.bzl @@ -13,10 +13,10 @@ # limitations under the License. load("@bazel_skylib//lib:new_sets.bzl", "sets") +load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("//build/bazel/rules/cc:cc_aidl_library.bzl", "cc_aidl_library") load("//build/bazel/rules/aidl:library.bzl", "aidl_library") -load("@bazel_skylib//lib:paths.bzl", "paths") +load("//build/bazel/rules/cc:cc_aidl_library.bzl", "cc_aidl_library") aidl_library_label_name = "foo_aidl_library" aidl_files = [ diff --git a/rules/cc/cc_binary_test.bzl b/rules/cc/cc_binary_test.bzl index f6f0fc98..3bae81da 100644 --- a/rules/cc/cc_binary_test.bzl +++ b/rules/cc/cc_binary_test.bzl @@ -14,9 +14,9 @@ load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load(":cc_binary.bzl", "cc_binary") +load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") load(":cc_library_shared.bzl", "cc_library_shared") load(":cc_library_static.bzl", "cc_library_static") -load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") def strip_test_assert_flags(env, strip_action, strip_flags): # Extract these flags from strip_action (for example): diff --git a/rules/cc/cc_hidl_library.bzl b/rules/cc/cc_hidl_library.bzl index 6456cfce..addeb3fa 100644 --- a/rules/cc/cc_hidl_library.bzl +++ b/rules/cc/cc_hidl_library.bzl @@ -13,10 +13,10 @@ # limitations under the License. load("//build/bazel/rules:hidl_file_utils.bzl", "LANGUAGE_CC_HEADERS", "LANGUAGE_CC_SOURCES", "hidl_file_utils") -load(":cc_library_common.bzl", "create_ccinfo_for_includes") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/hidl:hidl_library.bzl", "HidlInfo") +load(":cc_library_common.bzl", "create_ccinfo_for_includes") CC_SOURCE_SUFFIX = "_genc++" CC_HEADER_SUFFIX = "_genc++_headers" diff --git a/rules/cc/cc_hidl_library_test.bzl b/rules/cc/cc_hidl_library_test.bzl index a6b676aa..633da714 100644 --- a/rules/cc/cc_hidl_library_test.bzl +++ b/rules/cc/cc_hidl_library_test.bzl @@ -15,10 +15,10 @@ limitations under the License. load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") +load("//build/bazel/rules:hidl_file_utils.bzl", "INTERFACE_HEADER_PREFIXES", "TYPE_HEADER_PREFIXES") load("//build/bazel/rules/hidl:hidl_interface.bzl", "INTERFACE_SUFFIX") load("//build/bazel/rules/hidl:hidl_library.bzl", "hidl_library") -load(":cc_hidl_library.bzl", "CC_HEADER_SUFFIX", "CC_SOURCE_SUFFIX", "cc_hidl_library") -load("//build/bazel/rules:hidl_file_utils.bzl", "INTERFACE_HEADER_PREFIXES", "TYPE_HEADER_PREFIXES") +load(":cc_hidl_library.bzl", "CC_HEADER_SUFFIX", "cc_hidl_library") HIDL_GEN = "prebuilts/build-tools/linux-x86/bin/hidl-gen" diff --git a/rules/cc/cc_library_common.bzl b/rules/cc/cc_library_common.bzl index 5910e0b7..c5b41852 100644 --- a/rules/cc/cc_library_common.bzl +++ b/rules/cc/cc_library_common.bzl @@ -13,10 +13,10 @@ # limitations under the License. load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") -load("//build/bazel/rules/common:api.bzl", api_levels = "api_levels_with_previews") -load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("@soong_injection//android:constants.bzl", android_constants = "constants") +load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/rules:common.bzl", "strip_bp2build_label_suffix") +load("//build/bazel/rules/common:api.bzl", api_levels = "api_levels_with_previews") _bionic_targets = ["//bionic/libc", "//bionic/libdl", "//bionic/libm"] _static_bionic_targets = ["//bionic/libc:libc_bp2build_cc_library_static", "//bionic/libdl:libdl_bp2build_cc_library_static", "//bionic/libm:libm_bp2build_cc_library_static"] diff --git a/rules/cc/cc_library_shared.bzl b/rules/cc/cc_library_shared.bzl index 69ece7b4..5b8d33be 100644 --- a/rules/cc/cc_library_shared.bzl +++ b/rules/cc/cc_library_shared.bzl @@ -12,33 +12,31 @@ # See the License for the specific language governing permissions and # limitations under the License. -load( - ":composed_transitions.bzl", - "lto_and_fdo_profile_incoming_transition", -) +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") +load("//build/bazel/rules/abi:abi_dump.bzl", "AbiDiffInfo", "abi_dump") load( ":cc_library_common.bzl", "CcAndroidMkInfo", "add_lists_defaulting_to_none", - "create_cc_androidmk_provider", "parse_sdk_version", "sanitizer_deps", "system_dynamic_deps_defaults", ) load(":cc_library_static.bzl", "cc_library_static") -load(":lto_transitions.bzl", "lto_deps_transition") -load(":clang_tidy.bzl", "ClangTidyInfo", "collect_deps_clang_tidy_info") +load(":clang_tidy.bzl", "collect_deps_clang_tidy_info") +load( + ":composed_transitions.bzl", + "lto_and_fdo_profile_incoming_transition", +) load( ":fdo_profile_transitions.bzl", "FDO_PROFILE_ATTR_KEY", - "fdo_profile_transition", ) load(":generate_toc.bzl", "shared_library_toc", _CcTocInfo = "CcTocInfo") +load(":lto_transitions.bzl", "lto_deps_transition") load(":stl.bzl", "stl_info_from_attr") load(":stripped_cc_common.bzl", "CcUnstrippedInfo", "stripped_shared_library") load(":versioned_cc_common.bzl", "versioned_shared_library") -load("//build/bazel/rules/abi:abi_dump.bzl", "AbiDiffInfo", "abi_dump") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") CcTocInfo = _CcTocInfo diff --git a/rules/cc/cc_library_shared_test.bzl b/rules/cc/cc_library_shared_test.bzl index b4c3502c..d9f36d8b 100644 --- a/rules/cc/cc_library_shared_test.bzl +++ b/rules/cc/cc_library_shared_test.bzl @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_skylib//lib:dicts.bzl", "dicts") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("//build/bazel/rules/cc:cc_stub_library.bzl", "cc_stub_suite") -load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") -load("//build/bazel/rules/test_common:paths.bzl", "get_package_dir_based_path") load("//build/bazel/rules/test_common:flags.bzl", "action_flags_present_only_for_mnemonic_test") -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("@bazel_skylib//lib:dicts.bzl", "dicts") +load("//build/bazel/rules/test_common:paths.bzl", "get_package_dir_based_path") +load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") def _cc_library_shared_suffix_test_impl(ctx): env = analysistest.begin(ctx) diff --git a/rules/cc/cc_library_static.bzl b/rules/cc/cc_library_static.bzl index 2bbe748f..9e0fdf44 100644 --- a/rules/cc/cc_library_static.bzl +++ b/rules/cc/cc_library_static.bzl @@ -12,7 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -load(":lto_transitions.bzl", "lto_deps_transition") +load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") +load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") +load("//build/bazel/rules:common.bzl", "get_dep_targets") load( ":cc_library_common.bzl", "CPP_EXTENSIONS", @@ -27,13 +31,9 @@ load( "parse_sdk_version", "system_dynamic_deps_defaults", ) -load(":stl.bzl", "stl_info_from_attr") load(":clang_tidy.bzl", "ClangTidyInfo", "clang_tidy_for_dir", "generate_clang_tidy_actions") -load("@bazel_skylib//lib:paths.bzl", "paths") -load("//build/bazel/rules:common.bzl", "get_dep_targets") -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") +load(":lto_transitions.bzl", "lto_deps_transition") +load(":stl.bzl", "stl_info_from_attr") CcStaticLibraryInfo = provider(fields = ["root_static_archive", "objects"]) diff --git a/rules/cc/cc_library_static_test.bzl b/rules/cc/cc_library_static_test.bzl index 274f81c3..e2a4258f 100644 --- a/rules/cc/cc_library_static_test.bzl +++ b/rules/cc/cc_library_static_test.bzl @@ -14,14 +14,14 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") +load("//build/bazel/rules/cc:cc_binary.bzl", "cc_binary") +load("//build/bazel/rules/cc:cc_library_headers.bzl", "cc_library_headers") load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") -load("//build/bazel/rules/cc:cc_library_headers.bzl", "cc_library_headers") load("//build/bazel/rules/cc:cc_prebuilt_library_static.bzl", "cc_prebuilt_library_static") -load("//build/bazel/rules/cc:cc_binary.bzl", "cc_binary") -load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") load("//build/bazel/rules/test_common:paths.bzl", "get_output_and_package_dir_based_path", "get_package_dir_based_path") load("//build/bazel/rules/test_common:rules.bzl", "expect_failure_test") +load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") def _cc_library_static_propagating_compilation_context_test_impl(ctx): env = analysistest.begin(ctx) diff --git a/rules/cc/cc_object.bzl b/rules/cc/cc_object.bzl index 5b3b58c6..ba440b44 100644 --- a/rules/cc/cc_object.bzl +++ b/rules/cc/cc_object.bzl @@ -13,16 +13,15 @@ # limitations under the License. load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load(":lto_transitions.bzl", "lto_deps_transition") +load(":cc_constants.bzl", "constants") load( ":cc_library_common.bzl", "get_includes_paths", "is_external_directory", "parse_sdk_version", - "sdk_version_feature_from_parsed_version", "system_dynamic_deps_defaults", ) -load(":cc_constants.bzl", "constants") +load(":lto_transitions.bzl", "lto_deps_transition") load(":stl.bzl", "stl_info_from_attr") # "cc_object" module copts, taken from build/soong/cc/object.go diff --git a/rules/cc/cc_prebuilt_binary.bzl b/rules/cc/cc_prebuilt_binary.bzl index fa7217c6..15435042 100644 --- a/rules/cc/cc_prebuilt_binary.bzl +++ b/rules/cc/cc_prebuilt_binary.bzl @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -load(":stripped_cc_common.bzl", "common_strip_attrs", "stripped_impl") load("//build/bazel/platforms:platform_utils.bzl", "platforms") +load(":stripped_cc_common.bzl", "common_strip_attrs", "stripped_impl") def is_target_host(ctx): return not platforms.is_target_android(ctx.attr._platform_utils) diff --git a/rules/cc/cc_proto.bzl b/rules/cc/cc_proto.bzl index 76e7244d..80a5b446 100644 --- a/rules/cc/cc_proto.bzl +++ b/rules/cc/cc_proto.bzl @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_skylib//lib:paths.bzl", "paths") load("//build/bazel/rules:proto_file_utils.bzl", "proto_file_utils") load(":cc_library_common.bzl", "create_ccinfo_for_includes") load(":cc_library_static.bzl", "cc_library_static") -load("@bazel_skylib//lib:paths.bzl", "paths") _SOURCES_KEY = "sources" _HEADERS_KEY = "headers" diff --git a/rules/cc/cc_proto_test.bzl b/rules/cc/cc_proto_test.bzl index 2e683e48..490a1fbb 100644 --- a/rules/cc/cc_proto_test.bzl +++ b/rules/cc/cc_proto_test.bzl @@ -14,8 +14,8 @@ limitations under the License. """ load("@bazel_skylib//lib:paths.bzl", "paths") -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@bazel_skylib//lib:sets.bzl", "sets") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load(":cc_proto.bzl", "PROTO_GEN_NAME_SUFFIX", "cc_proto_library") PROTO_GEN = "external/protobuf/aprotoc" diff --git a/rules/cc/cc_stub_library.bzl b/rules/cc/cc_stub_library.bzl index 044cd360..0ae469d8 100644 --- a/rules/cc/cc_stub_library.bzl +++ b/rules/cc/cc_stub_library.bzl @@ -13,10 +13,10 @@ # limitations under the License. load("//build/bazel/platforms:platform_utils.bzl", "platforms") -load(":cc_library_static.bzl", "cc_library_static") +load("//build/bazel/rules/common:api.bzl", "parse_api_level_from_version") load(":cc_library_shared.bzl", "CcStubLibrariesInfo") +load(":cc_library_static.bzl", "cc_library_static") load(":fdo_profile_transitions.bzl", "drop_fdo_profile_transition") -load("//build/bazel/rules/common:api.bzl", "parse_api_level_from_version", api_levels = "api_levels_with_previews") # This file contains the implementation for the cc_stub_library rule. # diff --git a/rules/cc/cc_sysprop_library.bzl b/rules/cc/cc_sysprop_library.bzl index 261b3c85..1415d2ce 100644 --- a/rules/cc/cc_sysprop_library.bzl +++ b/rules/cc/cc_sysprop_library.bzl @@ -15,15 +15,13 @@ load( "//build/bazel/rules/sysprop:sysprop_library.bzl", "SyspropGenInfo", - "sysprop_library", ) -load(":cc_library_shared.bzl", "cc_library_shared") -load(":cc_library_static.bzl", "cc_library_static") load( ":cc_library_common.bzl", "create_ccinfo_for_includes", ) -load("@bazel_skylib//lib:paths.bzl", "paths") +load(":cc_library_shared.bzl", "cc_library_shared") +load(":cc_library_static.bzl", "cc_library_static") # TODO(b/240466571): Implement determination of exported includes def _cc_gen_sysprop_impl(ctx): diff --git a/rules/cc/cc_sysprop_library_test.bzl b/rules/cc/cc_sysprop_library_test.bzl index bc8c4e6a..546e4777 100644 --- a/rules/cc/cc_sysprop_library_test.bzl +++ b/rules/cc/cc_sysprop_library_test.bzl @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("//build/bazel/rules/sysprop:sysprop_library.bzl", "sysprop_library") load("//build/bazel/rules/test_common:args.bzl", "get_arg_value") load( @@ -20,7 +21,6 @@ load( "get_package_dir_based_path", ) load(":cc_sysprop_library.bzl", "cc_gen_sysprop") -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") def _provides_correct_outputs_test_impl(ctx): env = analysistest.begin(ctx) diff --git a/rules/cc/cc_test.bzl b/rules/cc/cc_test.bzl index 1ea23ef7..b6a11396 100644 --- a/rules/cc/cc_test.bzl +++ b/rules/cc/cc_test.bzl @@ -14,10 +14,10 @@ """cc_test macro for building native tests with Bazel.""" -load(":cc_binary.bzl", "cc_binary") load("//build/bazel/rules/cc:cc_library_common.bzl", "CcAndroidMkInfo") load("//build/bazel/rules/cc:stripped_cc_common.bzl", "CcUnstrippedInfo", "StrippedCcBinaryInfo") load("//build/bazel/rules/tradefed:tradefed.bzl", "tradefed_host_driven_test") +load(":cc_binary.bzl", "cc_binary") # TODO(b/244559183): Keep this in sync with cc/test.go#linkerFlags _gtest_copts = select({ diff --git a/rules/cc/cc_test_test.bzl b/rules/cc/cc_test_test.bzl index 310402e0..7ee17233 100644 --- a/rules/cc/cc_test_test.bzl +++ b/rules/cc/cc_test_test.bzl @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -load(":cc_test.bzl", "cc_test") +load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") load(":cc_library_shared.bzl", "cc_library_shared") load(":cc_library_static.bzl", "cc_library_static") -load(":cc_library_common_test.bzl", "target_provides_androidmk_info_test") +load(":cc_test.bzl", "cc_test") def _cc_test_provides_androidmk_info(): name = "cc_test_provides_androidmk_info" diff --git a/rules/cc/clang_tidy.bzl b/rules/cc/clang_tidy.bzl index bdfcde7d..a3b8425a 100644 --- a/rules/cc/clang_tidy.bzl +++ b/rules/cc/clang_tidy.bzl @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@bazel_skylib//lib:paths.bzl", "paths") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") +load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load( "@bazel_tools//tools/build_defs/cc:action_names.bzl", "CPP_COMPILE_ACTION_NAME", "C_COMPILE_ACTION_NAME", ) -load("@soong_injection//product_config:product_variables.bzl", "product_vars") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("@soong_injection//cc_toolchain:config_constants.bzl", "constants") +load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("//build/bazel/rules:common.bzl", "get_dep_targets") load(":cc_library_common.bzl", "get_compilation_args") diff --git a/rules/cc/clang_tidy_test.bzl b/rules/cc/clang_tidy_test.bzl index f9800026..618350e7 100644 --- a/rules/cc/clang_tidy_test.bzl +++ b/rules/cc/clang_tidy_test.bzl @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:new_sets.bzl", "sets") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("//build/bazel/rules/test_common:rules.bzl", "expect_failure_test") load( "//build/bazel/rules/test_common:args.bzl", "get_all_args_with_prefix", "get_single_arg_with_prefix", ) -load("//build/bazel/rules/aidl:interface.bzl", "aidl_interface") +load("//build/bazel/rules/test_common:rules.bzl", "expect_failure_test") load(":cc_library_static.bzl", "cc_library_static") load(":clang_tidy.bzl", "generate_clang_tidy_actions") diff --git a/rules/cc/composed_transitions.bzl b/rules/cc/composed_transitions.bzl index b6096387..b40af152 100644 --- a/rules/cc/composed_transitions.bzl +++ b/rules/cc/composed_transitions.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load(":lto_transitions.bzl", "CLI_FEATURES_KEY", "apply_drop_lto") load( ":fdo_profile_transitions.bzl", "CLI_CODECOV_KEY", @@ -20,6 +19,7 @@ load( "FDO_PROFILE_ATTR_KEY", "apply_fdo_profile", ) +load(":lto_transitions.bzl", "CLI_FEATURES_KEY", "apply_drop_lto") # Both LTO and FDO require an incoming transition on cc_library_shared def _lto_and_fdo_profile_incoming_transition_impl(settings, attr): diff --git a/rules/cc/flex_test.bzl b/rules/cc/flex_test.bzl index 8e5e9353..03fb644c 100644 --- a/rules/cc/flex_test.bzl +++ b/rules/cc/flex_test.bzl @@ -14,13 +14,13 @@ limitations under the License. """ load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load(":flex.bzl", "genlex") load("//build/bazel/rules/test_common:args.bzl", "get_arg_value") load( "//build/bazel/rules/test_common:paths.bzl", "get_output_and_package_dir_based_path", "get_package_dir_based_path", ) +load(":flex.bzl", "genlex") def _single_l_file_to_c_test_impl(ctx): env = analysistest.begin(ctx) diff --git a/rules/cc/lto_transitions_test.bzl b/rules/cc/lto_transitions_test.bzl index acea038b..bff4c7b1 100644 --- a/rules/cc/lto_transitions_test.bzl +++ b/rules/cc/lto_transitions_test.bzl @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") -load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") load("@bazel_skylib//lib:dicts.bzl", "dicts") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") +load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared") +load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") # TODO(b/270583469): Extract this and the equivalent logic for FDO ActionArgsInfo = provider( diff --git a/rules/cc/stl_test.bzl b/rules/cc/stl_test.bzl index 334fc5ee..6b0e2fb7 100644 --- a/rules/cc/stl_test.bzl +++ b/rules/cc/stl_test.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/product_variables:constants.bzl", "constants") load("@bazel_skylib//lib:new_sets.bzl", "sets") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load(":stl.bzl", "stl_info_from_attr") diff --git a/rules/cc/versioned_cc_common.bzl b/rules/cc/versioned_cc_common.bzl index aa624d62..55f3d8d2 100644 --- a/rules/cc/versioned_cc_common.bzl +++ b/rules/cc/versioned_cc_common.bzl @@ -14,8 +14,6 @@ """A macro to handle build number stamping.""" -load(":stripped_cc_common.bzl", "StrippedCcBinaryInfo") - def stamp_build_number(ctx, prefix = "", extension = ""): if len(ctx.files.src) != 1: fail("Expected only one input file for build number stamping") diff --git a/rules/cc/yasm.bzl b/rules/cc/yasm.bzl index 3e38182a..fd3076ba 100644 --- a/rules/cc/yasm.bzl +++ b/rules/cc/yasm.bzl @@ -14,7 +14,6 @@ limitations under the License. """ load("@bazel_skylib//lib:paths.bzl", "paths") -load(":cc_object.bzl", "CcObjectInfo", "cc_object") load("//build/bazel/platforms:platform_utils.bzl", "platforms") """Build rule for converting `.asm` files to `.o` files with yasm.""" diff --git a/rules/common/api.bzl b/rules/common/api.bzl index 20e2de2d..54d3b402 100644 --- a/rules/common/api.bzl +++ b/rules/common/api.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@soong_injection//product_config:product_variables.bzl", "product_vars") load("@soong_injection//api_levels:api_levels.bzl", "api_levels_released_versions") +load("@soong_injection//product_config:product_variables.bzl", "product_vars") PREVIEW_API_LEVEL_BASE = 9000 FUTURE_API_LEVEL_INT = 10000 # API Level associated with an arbitrary future release diff --git a/rules/gensrcs_test.bzl b/rules/gensrcs_test.bzl index 5b63d545..bdce0a6b 100644 --- a/rules/gensrcs_test.bzl +++ b/rules/gensrcs_test.bzl @@ -13,8 +13,8 @@ # limitations under the License. load("@bazel_skylib//lib:new_sets.bzl", "sets") -load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("//build/bazel/rules:gensrcs.bzl", "gensrcs") SRCS = [ diff --git a/rules/hidl_file_utils.bzl b/rules/hidl_file_utils.bzl index 82cc4758..1f042e47 100644 --- a/rules/hidl_file_utils.bzl +++ b/rules/hidl_file_utils.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/rules/hidl:hidl_library.bzl", "HidlInfo") load("@bazel_skylib//lib:paths.bzl", "paths") LANGUAGE_CC_HEADERS = "c++-headers" diff --git a/rules/java/BUILD b/rules/java/BUILD index b1a03621..cd3a1e87 100644 --- a/rules/java/BUILD +++ b/rules/java/BUILD @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. """ -load(":sdk_library_test.bzl", "java_sdk_library_test_suite") load(":merged_txts_test.bzl", "merged_txts_test_suite") +load(":sdk_library_test.bzl", "java_sdk_library_test_suite") java_sdk_library_test_suite(name = "java_sdk_library_tests") diff --git a/rules/java/proto.bzl b/rules/java/proto.bzl index b2f50350..16bb379c 100644 --- a/rules/java/proto.bzl +++ b/rules/java/proto.bzl @@ -13,7 +13,6 @@ # limitations under the License. load("//build/bazel/rules:proto_file_utils.bzl", "proto_file_utils") -load("@bazel_skylib//lib:paths.bzl", "paths") load(":library.bzl", "java_library") def _java_proto_sources_gen_rule_impl(ctx): diff --git a/rules/license/BUILD b/rules/license/BUILD index 635f80b0..26c69277 100644 --- a/rules/license/BUILD +++ b/rules/license/BUILD @@ -15,5 +15,3 @@ limitations under the License. """ package(default_visibility = ["//visibility:public"]) - -load("@rules_license//rules:license_kind.bzl", "license_kind") diff --git a/rules/linker_config.bzl b/rules/linker_config.bzl index 52449f5e..d9892a0d 100644 --- a/rules/linker_config.bzl +++ b/rules/linker_config.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//build/bazel/rules:prebuilt_file.bzl", "PrebuiltFileInfo") load("@bazel_skylib//lib:paths.bzl", "paths") +load("//build/bazel/rules:prebuilt_file.bzl", "PrebuiltFileInfo") def _linker_config_impl(ctx): output_file = ctx.actions.declare_file(paths.replace_extension(ctx.file.src.basename, ".pb")) diff --git a/rules/linker_config_test.bzl b/rules/linker_config_test.bzl index b3562c15..507344bf 100644 --- a/rules/linker_config_test.bzl +++ b/rules/linker_config_test.bzl @@ -13,7 +13,6 @@ # limitations under the License. load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("@bazel_skylib//lib:paths.bzl", "paths") load("//build/bazel/rules:linker_config.bzl", "linker_config") load("//build/bazel/rules:prebuilt_file.bzl", "PrebuiltFileInfo") diff --git a/rules/partitions/partition.bzl b/rules/partitions/partition.bzl index d49f9ce7..9d1e31c7 100644 --- a/rules/partitions/partition.bzl +++ b/rules/partitions/partition.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:dicts.bzl", "dicts") load("@bazel_skylib//lib:paths.bzl", "paths") load(":installable_info.bzl", "InstallableInfo", "installable_aspect") diff --git a/rules/prebuilt_xml.bzl b/rules/prebuilt_xml.bzl index 9da74077..13f7ba7e 100644 --- a/rules/prebuilt_xml.bzl +++ b/rules/prebuilt_xml.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:paths.bzl", "paths") load(":prebuilt_file.bzl", "PrebuiltFileInfo") _handled_dir = ["etc"] diff --git a/rules/prebuilt_xml_test.bzl b/rules/prebuilt_xml_test.bzl index 1ee93b91..8e74eee4 100644 --- a/rules/prebuilt_xml_test.bzl +++ b/rules/prebuilt_xml_test.bzl @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") -load("//build/bazel/rules:prebuilt_xml.bzl", "prebuilt_xml") load("//build/bazel/rules:prebuilt_file.bzl", "PrebuiltFileInfo") +load("//build/bazel/rules:prebuilt_xml.bzl", "prebuilt_xml") load("//build/bazel/rules/test_common:args.bzl", "get_arg_value") -load("@bazel_skylib//lib:paths.bzl", "paths") SRC = "fooSrc.xml" DIR = "etc/xml" diff --git a/rules/test_common/flags.bzl b/rules/test_common/flags.bzl index 356481f3..b3d5ee6c 100644 --- a/rules/test_common/flags.bzl +++ b/rules/test_common/flags.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:new_sets.bzl", "sets") load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") # Checks for the presence of a set of given flags in a set of given actions diff --git a/rules/test_common/paths.bzl b/rules/test_common/paths.bzl index bb980400..393e71f1 100644 --- a/rules/test_common/paths.bzl +++ b/rules/test_common/paths.bzl @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_skylib//lib:unittest.bzl", "analysistest") load("@bazel_skylib//lib:paths.bzl", "paths") +load("@bazel_skylib//lib:unittest.bzl", "analysistest") def get_package_dir_based_path(env, path): """ diff --git a/rules/tradefed/BUILD.bazel b/rules/tradefed/BUILD.bazel index d6dc8301..41750d8c 100644 --- a/rules/tradefed/BUILD.bazel +++ b/rules/tradefed/BUILD.bazel @@ -1,6 +1,6 @@ -load(":tradefed_test.bzl", "tradefed_test_suite") -load("@bazel_skylib//rules:common_settings.bzl", "string_flag") load("@bazel_skylib//lib:selects.bzl", "selects") +load("@bazel_skylib//rules:common_settings.bzl", "string_flag") +load(":tradefed_test.bzl", "tradefed_test_suite") # flags / configs. string_flag( diff --git a/rules/tradefed/tradefed_test.bzl b/rules/tradefed/tradefed_test.bzl index f8d0a9df..1953a2e2 100644 --- a/rules/tradefed/tradefed_test.bzl +++ b/rules/tradefed/tradefed_test.bzl @@ -14,11 +14,11 @@ load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static") -load(":tradefed.bzl", "tradefed_device_test", "tradefed_host_driven_test") load( "//build/bazel/rules/test_common:paths.bzl", "get_output_and_package_dir_based_path", ) +load(":tradefed.bzl", "tradefed_device_test", "tradefed_host_driven_test") def _test_tradefed_config_generation_impl(ctx): env = analysistest.begin(ctx) diff --git a/tests/apex/BUILD b/tests/apex/BUILD index fcb2abc4..37aa8808 100644 --- a/tests/apex/BUILD +++ b/tests/apex/BUILD @@ -1,7 +1,7 @@ -load(":apex_diff_test.bzl", "apex_diff_test") +load("@bazel_skylib//rules:diff_test.bzl", "diff_test") load(":apex_compression_test.bzl", "apex_compression_test") +load(":apex_diff_test.bzl", "apex_diff_test") load(":apex_package_name_test.bzl", "apex_package_name_test") -load("@bazel_skylib//rules:diff_test.bzl", "diff_test") # Test that the compressed apex and uncompressed apex have the same contents apex_diff_test( diff --git a/vendor/google/BUILD b/vendor/google/BUILD index ae1d1c78..5b2eeecd 100644 --- a/vendor/google/BUILD +++ b/vendor/google/BUILD @@ -1,7 +1,6 @@ -package(default_visibility = ["//build/bazel/tests/apex:__subpackages__"]) - load("//build/bazel/rules/apex:apex_aab.bzl", "apex_aab") -load("@bazel_skylib//rules:diff_test.bzl", "diff_test") + +package(default_visibility = ["//build/bazel/tests/apex:__subpackages__"]) # This package contains the multi-architecture aab and apks packages of # Bazel-buildable Mainline modules. These are exclusively used for development |