From 55a78bf5801f78ccb33ad689cc33cf3d1dcedc3a Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 26 Sep 2018 15:19:24 +0000
Subject: [PATCH] Revert "mkbootimg: Build mkbootimg with Soong."

This reverts commit 51360fc3497004fddcc351460bb9a1b9ae6b9b6a.

Reason for revert: Triggered some crash in Soong.

Bug: 116698229
Change-Id: Iab4827fdadc65cbabb60aa07eeac7b33acea68a0
---
 mkbootimg/Android.bp                          | 31 -------------------
 mkbootimg/Android.mk                          | 20 ++++++++++++
 mkbootimg/{mkbootimg.py => mkbootimg}         |  0
 .../{unpack_bootimg.py => unpack_bootimg}     |  0
 4 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 mkbootimg/Android.mk
 rename mkbootimg/{mkbootimg.py => mkbootimg} (100%)
 mode change 100644 => 100755
 rename mkbootimg/{unpack_bootimg.py => unpack_bootimg} (100%)
 mode change 100644 => 100755

diff --git a/mkbootimg/Android.bp b/mkbootimg/Android.bp
index c3cf74651..576a677e7 100644
--- a/mkbootimg/Android.bp
+++ b/mkbootimg/Android.bp
@@ -31,34 +31,3 @@ cc_library {
     header_libs: ["libmkbootimg_abi_headers"],
     export_header_lib_headers: ["libmkbootimg_abi_headers"],
 }
-
-python_defaults {
-    name: "mkbootimg_defaults",
-
-    version: {
-        py2: {
-            enabled: true,
-            embedded_launcher: true,
-        },
-        py3: {
-            enabled: false,
-            embedded_launcher: false,
-        },
-    },
-}
-
-python_binary_host {
-    name: "mkbootimg",
-    defaults: ["mkbootimg_defaults"],
-    srcs: [
-        "mkbootimg.py",
-    ],
-}
-
-python_binary_host {
-    name: "unpack_bootimg",
-    defaults: ["mkbootimg_defaults"],
-    srcs: [
-        "unpack_bootimg.py",
-    ],
-}
diff --git a/mkbootimg/Android.mk b/mkbootimg/Android.mk
new file mode 100644
index 000000000..92e1e27d2
--- /dev/null
+++ b/mkbootimg/Android.mk
@@ -0,0 +1,20 @@
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := mkbootimg
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_MODULE := mkbootimg
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := unpack_bootimg
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_MODULE := unpack_bootimg
+
+include $(BUILD_PREBUILT)
diff --git a/mkbootimg/mkbootimg.py b/mkbootimg/mkbootimg
old mode 100644
new mode 100755
similarity index 100%
rename from mkbootimg/mkbootimg.py
rename to mkbootimg/mkbootimg
diff --git a/mkbootimg/unpack_bootimg.py b/mkbootimg/unpack_bootimg
old mode 100644
new mode 100755
similarity index 100%
rename from mkbootimg/unpack_bootimg.py
rename to mkbootimg/unpack_bootimg