Revert "mkbootimg: Build mkbootimg with Soong."

This reverts commit 51360fc3497004fddcc351460bb9a1b9ae6b9b6a.

Reason for revert: Triggered some crash in Soong.

Bug: 116698229
Change-Id: Iab4827fdadc65cbabb60aa07eeac7b33acea68a0

4 files changed, 20 insertions, 31 deletions

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
index 2eb2bab56..2eb2bab56 100644..100755
--- a/mkbootimg/mkbootimg.py
+++ b/mkbootimg/mkbootimg
diff --git a/mkbootimg/unpack_bootimg.py b/mkbootimg/unpack_bootimg
index c37acd5ac..c37acd5ac 100644..100755
--- a/mkbootimg/unpack_bootimg.py
+++ b/mkbootimg/unpack_bootimg