From f78616bab30b92714873d59b07a14f2e41af5894 Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Fri, 11 Sep 2020 00:08:00 +0200
Subject: [PATCH] samsung: convert dtbhtoolExynos to blueprint

Change-Id: I0f9aff67e76ac47f792e92fca4802b50f893d37c
---
 Android.mk          |  1 -
 dtbhtool/Android.bp | 53 ++++++++++++++++++++++++++++++++++
 dtbhtool/Android.mk | 69 ---------------------------------------------
 3 files changed, 53 insertions(+), 70 deletions(-)
 create mode 100644 dtbhtool/Android.bp
 delete mode 100644 dtbhtool/Android.mk

diff --git a/Android.mk b/Android.mk
index c26d74e0..45fed5b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,6 @@ ifeq ($(BOARD_VENDOR),samsung)
 include $(SAM_ROOT)/AdvancedDisplay/Android.mk
 include $(SAM_ROOT)/audio/Android.mk
 include $(SAM_ROOT)/doze/Android.mk
-include $(SAM_ROOT)/dtbhtool/Android.mk
 include $(SAM_ROOT)/hidl/Android.mk
 include $(SAM_ROOT)/modemloader/Android.mk
 include $(SAM_ROOT)/ril/Android.mk
diff --git a/dtbhtool/Android.bp b/dtbhtool/Android.bp
new file mode 100644
index 00000000..0c21de6e
--- /dev/null
+++ b/dtbhtool/Android.bp
@@ -0,0 +1,53 @@
+cc_binary_host {
+    name: "dtbhtoolExynos",
+    shared_libs: [
+        "libdtbimg",
+    ],
+    static_libs: [
+        "libfdt",
+    ],
+    srcs: [
+        "mkdtbimg.c",
+    ],
+    local_include_dirs: ["libdtbimg"],
+}
+
+cc_binary_host {
+    name: "mkdtbhbootimg",
+    shared_libs: [
+        "libdtbimg",
+        "libcrypto",
+    ],
+    static_libs: [
+        "libfdt",
+    ],
+    srcs: [
+        "mkbootimg.c",
+    ],
+}
+
+cc_binary_host {
+    name: "unpackdtbhbootimg",
+    srcs: [
+        "unpackbootimg.c",
+    ],
+}
+
+cc_binary_host {
+    name: "unpackdtbhimg",
+    srcs: [
+        "unpackdtbhimg.c",
+    ],
+}
+
+cc_library {
+    name: "libdtbimg",
+    host_supported: true,
+    srcs: [
+        "dtbimg.c",
+    ],
+    static_libs: [
+        "libfdt",
+    ],
+    local_include_dirs: ["libdtbimg"],
+}
diff --git a/dtbhtool/Android.mk b/dtbhtool/Android.mk
deleted file mode 100644
index 6992700b..00000000
--- a/dtbhtool/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# Host static library
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := dtbimg.c
-LOCAL_STATIC_LIBRARIES := libfdt
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libdtbimg
-LOCAL_MODULE := libdtbimg
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := mkbootimg.c
-LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libcrypto_static
-
-LOCAL_MODULE := mkdtbhbootimg
-
-include $(BUILD_HOST_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := unpackbootimg.c
-LOCAL_MODULE := unpackdtbhbootimg
-include $(BUILD_HOST_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := mkdtbimg.c
-LOCAL_STATIC_LIBRARIES := libdtbimg libfdt
-
-LOCAL_MODULE := dtbhtoolExynos
-
-include $(BUILD_HOST_EXECUTABLE)
-
-# Target static library
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := dtbimg.c
-LOCAL_STATIC_LIBRARIES := libfdt
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libdtbimg
-LOCAL_MODULE := libdtbimg
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := mkbootimg.c
-LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libcrypto_static libcutils libc
-LOCAL_MODULE := utility_mkdtbhbootimg
-LOCAL_MODULE_STEM := mkdtbhbootimg
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := unpackbootimg.c
-LOCAL_STATIC_LIBRARIES := libcutils libc
-LOCAL_MODULE := utility_unpackdtbhbootimg
-LOCAL_MODULE_STEM := unpackdtbhbootimg
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := unpackdtbhimg.c
-LOCAL_MODULE := unpackdtbhimg
-include $(BUILD_HOST_EXECUTABLE)
-
-$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))