2 files changed, 39 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4339d3b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,39 @@
+cc_binary {
+    name: "libcbench",
+
+    srcs: [
+        "main.c",
+        "malloc.c",
+        "pthread.c",
+        "regex.c",
+        "stdio.c",
+        "string.c",
+    ],
+
+    vendor: true,
+
+    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_PATH
+    // LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+
+    compile_multilib: "both",
+    multilib: {
+    //    lib32: {
+            //stem: "libcbench32",
+    //        suffix:"32"
+    //    },
+        lib64: {
+            //stem: "libcbench64",
+            suffix: "64",
+        },
+    },
+
+    // WARNING: Module tags are not supported in Soong.
+    // Add this module to PRODUCT_PACKAGES_DEBUG in your product file if you want to
+    // force installation for -userdebug and -eng builds.
+    cflags: [
+        "-D__unused=__attribute__((unused))",
+        "-std=gnu99",
+        "-D_XOPEN_SOURCE=700",
+    ],
+
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 6c82dea..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= main.c \
-                  malloc.c \
-                  pthread.c \
-                  regex.c \
-                  stdio.c \
-                  string.c \
-
-LOCAL_MODULE := libcbench
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-
-LOCAL_MODULE_TAGS := debug
-LOCAL_CFLAGS += "-D__unused=__attribute__((unused))"
-
-LOCAL_CFLAGS += -std=gnu99 -D_XOPEN_SOURCE=700
-
-include $(BUILD_EXECUTABLE)