From 01a9401350d770d9bfe8ffcc9ee19abd756a00a3 Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Fri, 11 Sep 2020 13:16:32 +0200
Subject: [PATCH] loki_tool: convert to blueprint

Change-Id: Id35492c9f671c265d4b637eb4d536e812f48282b
---
 Android.mk           |  5 -----
 loki_tool/Android.bp | 15 +++++++++++++++
 loki_tool/Android.mk | 17 -----------------
 3 files changed, 15 insertions(+), 22 deletions(-)
 create mode 100644 loki_tool/Android.bp
 delete mode 100644 loki_tool/Android.mk

diff --git a/Android.mk b/Android.mk
index d9efe58e..c26d74e0 100644
--- 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
index 00000000..06bae748
--- /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
index b8f7a4af..00000000
--- 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)