Convert rmi4utils to Android.bp am: 6268d417c2 am: e7b5242a00

am: dd867b6b7c

Change-Id: Ie7db78e03f627680dcf9ca66c16dc06caf22b047

9 files changed, 55 insertions, 52 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index aa2f4b5..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(call all-subdir-makefiles)
diff --git a/f54test/Android.bp b/f54test/Android.bp
new file mode 100644
index 0000000..12f7307
--- /dev/null
+++ b/f54test/Android.bp
@@ -0,0 +1,16 @@
+cc_binary {
+    name: "f54test",
+    srcs: [
+        "main.cpp",
+        "f54test.cpp",
+        "testutil.cpp",
+        "display.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-sometimes-uninitialized",
+        "-Wno-unused-parameter",
+    ],
+    static_libs: ["rmidevice"],
+}
diff --git a/f54test/Android.mk b/f54test/Android.mk
deleted file mode 100644
index 81b4521..0000000
--- a/f54test/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := f54test
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
-LOCAL_SRC_FILES := main.cpp f54test.cpp testutil.cpp display.cpp
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-sometimes-uninitialized \
-    -Wno-unused-parameter \
-
-LOCAL_STATIC_LIBRARIES := rmidevice
-
-include $(BUILD_EXECUTABLE)
diff --git a/rmi4update/Android.bp b/rmi4update/Android.bp
new file mode 100644
index 0000000..91142e2
--- /dev/null
+++ b/rmi4update/Android.bp
@@ -0,0 +1,15 @@
+cc_binary {
+    name: "rmi4update",
+    srcs: [
+        "main.cpp",
+        "rmi4update.cpp",
+        "updateutil.cpp",
+        "firmware_image.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+    static_libs: ["rmidevice"],
+}
diff --git a/rmi4update/Android.mk b/rmi4update/Android.mk
deleted file mode 100644
index fc3d2c5..0000000
--- a/rmi4update/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := rmi4update
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
-LOCAL_SRC_FILES := main.cpp rmi4update.cpp updateutil.cpp firmware_image.cpp
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-unused-parameter \
-
-LOCAL_STATIC_LIBRARIES := rmidevice
-
-include $(BUILD_EXECUTABLE)
diff --git a/rmidevice/Android.bp b/rmidevice/Android.bp
new file mode 100644
index 0000000..7640c2c
--- /dev/null
+++ b/rmidevice/Android.bp
@@ -0,0 +1,14 @@
+cc_library_static {
+    name: "rmidevice",
+    srcs: [
+        "rmifunction.cpp",
+        "rmidevice.cpp",
+        "hiddevice.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+    export_include_dirs: ["."],
+}
diff --git a/rmidevice/Android.mk b/rmidevice/Android.mk
deleted file mode 100644
index 3f075d7..0000000
--- a/rmidevice/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := rmidevice
-LOCAL_SRC_FILES := rmifunction.cpp rmidevice.cpp hiddevice.cpp
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-unused-parameter \
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/rmihidtool/Android.bp b/rmihidtool/Android.bp
new file mode 100644
index 0000000..222a120
--- /dev/null
+++ b/rmihidtool/Android.bp
@@ -0,0 +1,10 @@
+cc_binary {
+    name: "rmihidtool",
+    srcs: ["main.cpp"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+    static_libs: ["rmidevice"],
+}
diff --git a/rmihidtool/Android.mk b/rmihidtool/Android.mk
deleted file mode 100644
index 59a1e4e..0000000
--- a/rmihidtool/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := rmihidtool
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../rmidevice
-LOCAL_SRC_FILES := main.cpp
-LOCAL_CFLAGS := \
-    -Wall -Werror \
-    -Wno-unused-parameter \
-
-LOCAL_STATIC_LIBRARIES := rmidevice
-
-include $(BUILD_EXECUTABLE)