tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: kselftest config doesn't use copy_file.

Browse Source 
Just use pkg_files directly.

Bug: 312798837
Change-Id: Ie552a007a41be6a9e7bfeba69fd501b436680b62
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
HONG Yifan
2024-08-02 16:26:09 -07:00
committed by Yifan Hong
parent 551c6efeb2
commit d303b0f354
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.bazel
+13 -12
View File
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2021 The Android Open Source Project
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
load("@bazel_skylib//rules:write_file.bzl", "write_file")
load("@rules_pkg//pkg:install.bzl", "pkg_install")
load(
@@ -1973,15 +1972,17 @@ cc_binary_with_abi(
],
)
copy_file(
name = "kselftest_gen_config",
src = select({
":x86_64": "tools/testing/selftests/android/config_x86_64.xml",
":i386": "tools/testing/selftests/android/config_x86.xml",
":arm64": "tools/testing/selftests/android/config_arm64.xml",
":arm": "tools/testing/selftests/android/config_arm.xml",
}),
out = _KSELFTEST_DIR + "/selftests.config",
pkg_files(
name = "kselftest_config_x86_64",
srcs = ["tools/testing/selftests/android/config_x86_64.xml"],
renames = {"tools/testing/selftests/android/config_x86_64.xml": _KSELFTEST_DIR + "/selftests.config"},
visibility = ["//visibility:private"],
)
pkg_files(
name = "kselftest_config_arm64",
srcs = ["tools/testing/selftests/android/config_arm64.xml"],
renames = {"tools/testing/selftests/android/config_arm64.xml": _KSELFTEST_DIR + "/selftests.config"},
visibility = ["//visibility:private"],
)
@@ -2001,7 +2002,6 @@ android_filegroup(
":kselftest_futex_futex_wait_uninitialized_heap_x86_64",
":kselftest_futex_futex_wait_wouldblock_x86_64",
":kselftest_futex_futex_wait_x86_64",
":kselftest_gen_config",
":kselftest_kcmp_kcmp_test_x86_64",
":kselftest_mm_compaction_test_x86_64",
":kselftest_mm_hugepage_mmap_x86_64",
@@ -2205,7 +2205,6 @@ android_filegroup(
":kselftest_futex_futex_wait_timeout_arm64",
":kselftest_futex_futex_wait_uninitialized_heap_arm64",
":kselftest_futex_futex_wait_wouldblock_arm64",
":kselftest_gen_config",
":kselftest_kcmp_kcmp_test_arm64",
":kselftest_mm_compaction_test_arm64",
":kselftest_mm_hugepage_mmap_arm64",
@@ -2277,6 +2276,7 @@ pkg_files(
pkg_zip(
name = "tests_zip_x86_64",
srcs = [
":kselftest_config_x86_64",
":kselftest_tests_x86_64_pkg_files",
":kunit_tests_x86_64_pkg_files",
],
@@ -2287,6 +2287,7 @@ pkg_zip(
pkg_zip(
name = "tests_zip_arm64",
srcs = [
":kselftest_config_arm64",
":kselftest_tests_arm64_pkg_files",
":kunit_tests_arm64_pkg_files",
],