Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5e8161 authored by Tao Bao's avatar Tao Bao
Browse files

Revert "Revert "mkbootimg: Build mkbootimg with Soong."" 

This reverts commit 55a78bf5.

There's no change in this CL from the initial landing. The earlier crash
was caused by manifest setup in build-tools and clang-tools branches,
which has been addressed by the following CLs.
https://android-review.googlesource.com/c/platform/manifest/+/769045
https://android-review.googlesource.com/c/platform/manifest/+/769044

Bug: 116698229
Change-Id: I33701c9f77e814257cc5c65ad7aa587835ae00ad
Test: TreeHugger
parent 55a78bf5

mkbootimg/Android.bp

+31 −0
Original line number Diff line number Diff line
@@ -31,3 +31,34 @@ 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",

    ],

}

mkbootimg/Android.mk

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 


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)

mkbootimg/mkbootimg→mkbootimg/mkbootimg.py

100755 → 100644
+0 −0

File moved.File mode changed from 100755 to 100644.

View file

mkbootimg/unpack_bootimg→mkbootimg/unpack_bootimg.py

100755 → 100644
+0 −0

File moved.File mode changed from 100755 to 100644.

View file