From fea69a6cfb74dce9535d733c86ce5d8cfbc2be30 Mon Sep 17 00:00:00 2001
From: Yongqin Liu <yongqin.liu@linaro.org>
Date: Mon, 18 Feb 2019 12:02:09 +0800
Subject: Convert Android.mk to Android.bp

Change-Id: I0f44a90ce135fb639eb97f78273b39e0d470d583
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
---
 Android.bp | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Android.mk | 55 -------------------------------------------
 2 files changed, 79 insertions(+), 55 deletions(-)
 create mode 100644 Android.bp
 delete mode 100644 Android.mk

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..d12c31a
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,79 @@
+cc_binary {
+    name: "stringbench",
+
+    srcs: ["stringbench.c"],
+
+    compile_multilib: "both",
+    multilib: {
+//        lib32: {
+//            suffix: "32",
+//        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
+    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_PATH
+    // LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+
+    cflags: [
+        "-std=gnu99",
+        "-D__unused=__attribute__((unused))"
+    ],
+
+    vendor: true,
+}
+
+cc_binary {
+    name: "harness",
+
+    srcs: ["harness.c"],
+
+    compile_multilib: "both",
+    multilib: {
+ //       lib32: {
+ //           suffix: "32",
+ //       },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
+    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_PATH
+    // LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+
+    cflags: [
+        "-std=gnu99",
+        "-D__unused=__attribute__((unused))"
+    ],
+
+    vendor: true,
+}
+
+cc_binary {
+    name: "dhry-linaro",
+
+    srcs: [
+        "dhry_1.c",
+        "dhry_2.c",
+    ],
+
+    compile_multilib: "both",
+    multilib: {
+    //    lib32: {
+    //        suffix: "32",
+    //    },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
+    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_PATH
+    // LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+
+//    cflags: [
+//        "-I."
+//    ],
+//  local_include_dirs: ["."]
+    vendor: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 08428f7..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= stringbench.c
-
-LOCAL_MODULE := stringbench
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_MODULE_TAGS := debug
-
-LOCAL_CFLAGS += -std=gnu99
-LOCAL_CFLAGS += "-D__unused=__attribute__((unused))"
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= harness.c
-
-LOCAL_MODULE := harness
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_MODULE_TAGS := debug
-
-LOCAL_CFLAGS += -std=gnu99
-LOCAL_CFLAGS += "-D__unused=__attribute__((unused))"
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= dhry_1.c dhry_2.c
-
-LOCAL_MODULE := dhry-linaro
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_MODULE_TAGS := debug
-
-LOCAL_CFLAGS += -I.
-
-include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3