From d7ed8af8ce86941bc5bd99d2f7b863436adc1f4e Mon Sep 17 00:00:00 2001 From: John Moon Date: Mon, 13 Mar 2023 11:04:37 -0700 Subject: [PATCH] ANDROID: build: Remove branch argument from define_common_kernels Currently, we are passing in the a branch argument to the call to define_common_kernels(). This is because Kleaf required this argument if the function was called outside of the ACK tree. With a recent upstream update, the argument is no longer needed. So, let's remove the argument. This has an added benefit of allowing our BUILD.bazel file to match ACK's more closely. Change-Id: I64278699ed5e23d2220b98135827a10684c6afbc Signed-off-by: John Moon --- BUILD.bazel | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index a5b714525cb2..fb449f23948a 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -21,9 +21,7 @@ _aarch64_additional_kmi_symbol_lists = [ "android/abi_gki_aarch64_virtual_device", ] -load("@kernel_toolchain_info//:dict.bzl", "BRANCH") - -define_common_kernels(branch = BRANCH, target_configs = { +define_common_kernels(target_configs = { "kernel_aarch64": { # TODO(b/269346251): re-enable strict mode "kmi_symbol_list_strict_mode": False,