loki_tool: convert to blueprint

Change-Id: Id35492c9f671c265d4b637eb4d536e812f48282b

diff --git a/Android.mk b/Android.mk
index d9efe58e9b58b37a444a4b8e02e79746cf126524..c26d74e080d081feebe3c348b0ab602f0ec82bf0 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -35,11 +35,6 @@ include $(SAM_ROOT)/macloader/Android.mk
 include $(SAM_ROOT)/wifiloader/Android.mk
 endif
 
-# Loki
-ifeq ($(strip $(TARGET_NEEDS_LOKI)),true)
-include $(SAM_ROOT)/loki_tool/Android.mk
-endif
-
 ifeq ($(BOARD_VENDOR),samsung)
 include $(SAM_ROOT)/AdvancedDisplay/Android.mk
 include $(SAM_ROOT)/audio/Android.mk

diff --git a/loki_tool/Android.bp b/loki_tool/Android.bp
new file mode 100644 (file)
index 0000000..06bae74
--- /dev/null
+++ b/loki_tool/Android.bp
@@ -0,0 +1,15 @@
+cc_binary_host {
+    name: "loki_tool",
+    cflags: [
+        "-Wno-pointer-arith",
+        "-Wno-unused-result",
+        "-Wno-sign-compare",
+    ],
+    srcs: [
+        "loki_flash.c",
+        "loki_patch.c",
+        "loki_find.c",
+        "loki_unlok.c",
+        "main.c",
+    ],
+}

diff --git a/loki_tool/Android.mk b/loki_tool/Android.mk
deleted file mode 100644 (file)
index b8f7a4a..0000000
--- a/loki_tool/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# build static binary
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Wno-pointer-arith -Wno-unused-result -Wno-sign-compare
-LOCAL_SRC_FILES := loki_flash.c loki_patch.c loki_find.c loki_unlok.c main.c
-LOCAL_MODULE := loki_tool_static
-LOCAL_MODULE_STEM := loki_tool
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-include $(BUILD_EXECUTABLE)
-
-# build host binary
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Wno-pointer-arith -Wno-unused-result -Wno-sign-compare
-LOCAL_SRC_FILES := loki_flash.c loki_patch.c loki_find.c loki_unlok.c main.c
-LOCAL_MODULE := loki_tool
-include $(BUILD_HOST_EXECUTABLE)