Convert to Android.bp

am: 34c8a40b5e

Change-Id: I799b932681d70e63ca4538b81d529de645a81689

4 files changed, 268 insertions, 219 deletions

diff --git a/Android.bp b/Android.bp
index ae8cd6e96576..2f03920b3340 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,6 +96,15 @@ cc_test {
     static_libs: ["libcap-ng"],
 }
 
+// Cpu-hotplug test
+sh_test {
+    name: "kselftest_cpu-hotplug_cpu-on-off-test",
+    sub_dir: "linux-kselftest/cpu-hotplug",
+    src: "tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Efivarfs test
 cc_test {
     name: "kselftest_efivarfs_tests",
@@ -107,6 +116,14 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+sh_test {
+    name: "kselftest_efivarfs_efivarfs",
+    sub_dir: "linux-kselftest/efivarfs",
+    src: "tools/testing/selftests/efivarfs/efivarfs.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Exec test
 cc_test {
     name: "kselftest_exec_test",
@@ -117,6 +134,104 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+sh_test {
+    name: "kselftest_exec_execveat.sh",
+    sub_dir: "linux-kselftest/exec",
+    src: "tools/testing/selftests/exec/execveat.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+// Firmware test
+sh_test {
+    name: "kselftest_firmware_fw_fallback",
+    sub_dir: "linux-kselftest/firmware",
+    src: "tools/testing/selftests/firmware/fw_fallback.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_firmware_fw_filesystem",
+    sub_dir: "linux-kselftest/firmware",
+    src: "tools/testing/selftests/firmware/fw_filesystem.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+// Ftrace test
+sh_test {
+    name: "kselftest_ftrace_ftracetest",
+    sub_dir: "linux-kselftest/ftrace",
+    src: "tools/testing/selftests/ftrace/ftracetest",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_functions",
+    sub_dir: "linux-kselftest/ftrace/test.d",
+    src: "tools/testing/selftests/ftrace/test.d/functions",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_00basic_basic2",
+    sub_dir: "linux-kselftest/ftrace/test.d/00basic",
+    src: "tools/testing/selftests/ftrace/test.d/00basic/basic2.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_00basic_basic4",
+    sub_dir: "linux-kselftest/ftrace/test.d/00basic",
+    src: "tools/testing/selftests/ftrace/test.d/00basic/basic4.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_00basic_basic1",
+    sub_dir: "linux-kselftest/ftrace/test.d/00basic",
+    src: "tools/testing/selftests/ftrace/test.d/00basic/basic1.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_00basic_basic3",
+    sub_dir: "linux-kselftest/ftrace/test.d/00basic",
+    src: "tools/testing/selftests/ftrace/test.d/00basic/basic3.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_template",
+    sub_dir: "linux-kselftest/ftrace/test.d",
+    src: "tools/testing/selftests/ftrace/test.d/template",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_instances_instance",
+    sub_dir: "linux-kselftest/ftrace/test.d/instances",
+    src: "tools/testing/selftests/ftrace/test.d/instances/instance.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_ftrace_test.d_instances_instance-event",
+    sub_dir: "linux-kselftest/ftrace/test.d/instances",
+    src: "tools/testing/selftests/ftrace/test.d/instances/instance-event.tc",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Futex test
 cc_test {
     name: "kselftest_futex_tests",
@@ -141,6 +256,14 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+sh_test {
+    name: "kselftest_futex_functional_run.sh",
+    sub_dir: "linux-kselftest/futex/functional",
+    src: "tools/testing/selftests/futex/functional/run.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // intel_pstate test
 cc_test {
     name: "kselftest_intel_pstate_tests",
@@ -156,6 +279,14 @@ cc_test {
     // TODO: test_data: intel_pstate/run.sh
 }
 
+sh_test {
+    name: "kselftest_intel_pstate_run.sh",
+    sub_dir: "linux-kselftest/intel_pstate",
+    src: "tools/testing/selftests/intel_pstate/run.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Kcmp test
 cc_test {
     name: "kselftest_kcmp_tests",
@@ -164,6 +295,23 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+// Lib test
+sh_test {
+    name: "kselftest_lib_printf",
+    sub_dir: "linux-kselftest/lib",
+    src: "tools/testing/selftests/lib/printf.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_lib_bitmap",
+    sub_dir: "linux-kselftest/lib",
+    src: "tools/testing/selftests/lib/bitmap.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // media_tests test
 cc_test {
     name: "kselftest_media_tests",
@@ -184,6 +332,15 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+// Memory-hotplug test
+sh_test {
+    name: "kselftest_memory-hotplug_mem-on-off-test",
+    sub_dir: "linux-kselftest/memory-hotplug",
+    src: "tools/testing/selftests/memory-hotplug/mem-on-off-test.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Mount test
 cc_test {
     name: "kselftest_mount_tests",
@@ -207,6 +364,47 @@ cc_test {
     // TODO: test_data: net/test_bpf.sh
 }
 
+sh_test {
+    name: "kselftest_net_test_bpf",
+    sub_dir: "linux-kselftest/net",
+    src: "tools/testing/selftests/net/test_bpf.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+// Pstore test
+sh_test {
+    name: "kselftest_pstore_pstore_tests",
+    sub_dir: "linux-kselftest/pstore",
+    src: "tools/testing/selftests/pstore/pstore_tests",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_pstore_pstore_post_reboot_tests",
+    sub_dir: "linux-kselftest/pstore",
+    src: "tools/testing/selftests/pstore/pstore_post_reboot_tests",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_pstore_common_tests",
+    sub_dir: "linux-kselftest/pstore",
+    src: "tools/testing/selftests/pstore/common_tests",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_pstore_pstore_crash_test",
+    sub_dir: "linux-kselftest/pstore",
+    src: "tools/testing/selftests/pstore/pstore_crash_test",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Ptrace test
 cc_test {
     name: "kselftest_ptrace_tests",
@@ -248,6 +446,23 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+sh_test {
+    name: "kselftest_splice_default_file_splice_read.sh",
+    sub_dir: "linux-kselftest/splice",
+    src: "tools/testing/selftests/splice/default_file_splice_read.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+// Static keys test
+sh_test {
+    name: "kselftest_static_keys_test_static_keys",
+    sub_dir: "linux-kselftest/static_keys",
+    src: "tools/testing/selftests/static_keys/test_static_keys.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // Timer test
 cc_test {
     name: "kselftest_timer_tests",
@@ -280,6 +495,15 @@ cc_test {
     defaults: ["kselftest_defaults"],
 }
 
+// User test
+sh_test {
+    name: "kselftest_user_test_user_copy",
+    sub_dir: "linux-kselftest/user",
+    src: "tools/testing/selftests/user/test_user_copy.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
 // vdso test
 cc_test {
     name: "kselftest_vdso_test",
@@ -323,8 +547,16 @@ cc_test {
         arm64: {
             enabled: true,
             cflags: ["-D__aarch64__"],
-        }
-    }
+        },
+    },
+}
+
+sh_test {
+    name: "kselftest_vm_run_vmtests",
+    sub_dir: "linux-kselftest/vm",
+    src: "tools/testing/selftests/vm/run_vmtests",
+    filename_from_src: true,
+    compile_multilib: "both",
 }
 
 // x86 tests
@@ -335,7 +567,7 @@ cc_test {
         "tools/testing/selftests/x86/single_step_syscall.c",
         "tools/testing/selftests/x86/syscall_nt.c",
         "tools/testing/selftests/x86/test_mremap_vdso.c",
-        "tools/testing/selftests/x86/ldt_gdt.c"
+        "tools/testing/selftests/x86/ldt_gdt.c",
     ],
     arch: {
         arm: {
@@ -440,3 +672,36 @@ cc_test {
         },
     },
 }
+
+// zram tests
+sh_test {
+    name: "kselftest_zram_zram.sh",
+    sub_dir: "linux-kselftest/zram",
+    src: "tools/testing/selftests/zram/zram.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_zram_zram01.sh",
+    sub_dir: "linux-kselftest/zram",
+    src: "tools/testing/selftests/zram/zram01.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_zram_zram02.sh",
+    sub_dir: "linux-kselftest/zram",
+    src: "tools/testing/selftests/zram/zram02.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
+
+sh_test {
+    name: "kselftest_zram_zram_lib.sh",
+    sub_dir: "linux-kselftest/zram",
+    src: "tools/testing/selftests/zram/zram_lib.sh",
+    filename_from_src: true,
+    compile_multilib: "both",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3675d387a6b9..000000000000
--- a/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-build_kselftest_prebuilt := $(LOCAL_PATH)/android/Android.prebuilt.mk
-include $(LOCAL_PATH)/android/Android.kselftest.mk
diff --git a/android/Android.kselftest.mk b/android/Android.kselftest.mk
deleted file mode 100644
index bf3d6645fab8..000000000000
--- a/android/Android.kselftest.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Cpu-hotplug test
-module_prebuilt := cpu-hotplug/cpu-on-off-test
-module_src_files := cpu-hotplug/cpu-on-off-test.sh
-include $(build_kselftest_prebuilt)
-
-# Efivarfs test
-module_prebuilt := efivarfs/efivarfs
-module_src_files := efivarfs/efivarfs.sh
-include $(build_kselftest_prebuilt)
-
-# Exec test
-module_prebuilt := exec/execveat.sh
-module_src_files := exec/execveat.sh
-include $(build_kselftest_prebuilt)
-
-# Firmware test
-
-module_prebuilt := firmware/fw_fallback
-module_src_files := firmware/fw_fallback.sh
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := firmware/fw_filesystem
-module_src_files := firmware/fw_filesystem.sh
-include $(build_kselftest_prebuilt)
-
-# Ftrace test
-module_prebuilt := ftrace/ftracetest
-module_src_files := ftrace/ftracetest
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/functions
-module_src_files := ftrace/test.d/functions
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/00basic/basic2
-module_src_files := ftrace/test.d/00basic/basic2.tc
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/00basic/basic4
-module_src_files := ftrace/test.d/00basic/basic4.tc
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/00basic/basic1
-module_src_files := ftrace/test.d/00basic/basic1.tc
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/00basic/basic3
-module_src_files := ftrace/test.d/00basic/basic3.tc
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/template
-module_src_files := ftrace/test.d/template
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/instances/instance
-module_src_files := ftrace/test.d/instances/instance.tc
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := ftrace/test.d/instances/instance-event
-module_src_files := ftrace/test.d/instances/instance-event.tc
-include $(build_kselftest_prebuilt)
-
-# futex test
-module_prebuilt := futex/functional/run.sh
-module_src_files := futex/functional/run.sh
-include $(build_kselftest_prebuilt)
-
-# intel_pstate test
-module_prebuilt := intel_pstate/run.sh
-module_src_files := intel_pstate/run.sh
-include $(build_kselftest_prebuilt)
-
-# Lib test
-module_prebuilt := lib/printf
-module_src_files := lib/printf.sh
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := lib/bitmap
-module_src_files := lib/bitmap.sh
-include $(build_kselftest_prebuilt)
-
-# Memory-hotplug test
-module_prebuilt := memory-hotplug/mem-on-off-test
-module_src_files := memory-hotplug/mem-on-off-test.sh
-include $(build_kselftest_prebuilt)
-
-# Net test
-module_prebuilt := net/test_bpf
-module_src_files := net/test_bpf.sh
-include $(build_kselftest_prebuilt)
-
-# Pstore test
-module_prebuilt := pstore/pstore_tests
-module_src_files := pstore/pstore_tests
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := pstore/pstore_post_reboot_tests
-module_src_files := pstore/pstore_post_reboot_tests
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := pstore/common_tests
-module_src_files := pstore/common_tests
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := pstore/pstore_crash_test
-module_src_files := pstore/pstore_crash_test
-include $(build_kselftest_prebuilt)
-
-
-# splice test
-module_prebuilt := splice/default_file_splice_read.sh
-module_src_files := splice/default_file_splice_read.sh
-include $(build_kselftest_prebuilt)
-
-# Static keys test
-module_prebuilt := static_keys/test_static_keys
-module_src_files := static_keys/test_static_keys.sh
-include $(build_kselftest_prebuilt)
-
-# User test
-module_prebuilt := user/test_user_copy
-module_src_files := user/test_user_copy.sh
-include $(build_kselftest_prebuilt)
-
-# vm test
-module_prebuilt := vm/run_vmtests
-module_src_files := vm/run_vmtests
-include $(build_kselftest_prebuilt)
-
-# zram tests
-module_prebuilt := zram/zram.sh
-module_src_files := zram/zram.sh
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := zram/zram01.sh
-module_src_files := zram/zram01.sh
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := zram/zram02.sh
-module_src_files := zram/zram02.sh
-include $(build_kselftest_prebuilt)
-
-module_prebuilt := zram/zram_lib.sh
-module_src_files := zram/zram_lib.sh
-include $(build_kselftest_prebuilt)
-
diff --git a/android/Android.prebuilt.mk b/android/Android.prebuilt.mk
deleted file mode 100644
index 193338503e5a..000000000000
--- a/android/Android.prebuilt.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include $(CLEAR_VARS)
-
-module_name := kselftest_$(subst /,_,$(module_prebuilt))
-module_stem := $(notdir $(module_src_files))
-module_path := $(dir $(module_src_files))
-
-LOCAL_MODULE := $(module_name)
-LOCAL_INSTALLED_MODULE_STEM := $(module_stem)
-LOCAL_PREBUILT_MODULE_FILE := $(LOCAL_PATH)/tools/testing/selftests/$(module_src_files)
-LOCAL_MODULE_RELATIVE_PATH := linux-kselftest/$(module_path)
-LOCAL_MODULE_CLASS := NATIVE_TESTS
-LOCAL_MULTILIB := both
-
-include $(BUILD_PREBUILT)
-
-module_name :=
-module_stem :=
-module_path :=