2 files changed, 31 insertions, 28 deletions
diff --git a/tests/memtest/Android.bp b/tests/memtest/Android.bp
new file mode 100644
index 00000000..cf8b286e
--- /dev/null
+++ b/tests/memtest/Android.bp
@@ -0,0 +1,31 @@
+// Copyright 2006 The Android Open Source Project
+
+cc_binary {
+    name: "memtest",
+
+    srcs: [
+        "memtest.cpp",
+        "fptest.cpp",
+        "thumb.cpp",
+        "bandwidth.cpp",
+    ],
+
+    cflags: [
+        "-fomit-frame-pointer",
+        "-Wall",
+        "-Werror",
+    ],
+
+    sanitize: {
+        never: true,
+    },
+
+    enabled: false,
+    arch: {
+        arm: {
+            enabled: true,
+            instruction_set: "thumb",
+        },
+    },
+
+}
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
deleted file mode 100644
index 372aaf8e..00000000
--- a/tests/memtest/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-ifneq ($(filter $(TARGET_ARCH),arm arm64),)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    memtest.cpp \
-    fptest.cpp \
-    thumb.cpp \
-    bandwidth.cpp \
-
-LOCAL_MODULE := memtest
-LOCAL_MODULE_TAGS := debug
-LOCAL_CFLAGS += \
-    -fomit-frame-pointer \
-    -Wall \
-    -Werror \
-
-LOCAL_MULTILIB := 32
-
-LOCAL_SANITIZE := never
-
-LOCAL_ARM_MODE := thumb
-
-include $(BUILD_EXECUTABLE)
-endif