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

Commit 38d5e608 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Build libinstall as a static library."

parents 8e0821e6 0deed338

Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ cc_defaults { 
    ],



    static_libs: [

        "libinstall",

        "librecovery_fastboot",

        "libminui",

        "libotautil",
@@ -92,7 +93,6 @@ cc_library_static { 
    ],



    shared_libs: [

        "libinstall",

        "librecovery_ui",

    ],

}
@@ -112,7 +112,6 @@ cc_binary { 
    ],



    shared_libs: [

        "libinstall",

        "libminadbd_services",

        "librecovery_ui",

    ],

CleanSpec.mk

+7 −3
Original line number Diff line number Diff line
@@ -44,9 +44,13 @@ 
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/recovery_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libminui_intermediates/import_includes)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libinstall.recovery_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/libinstall.so)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

install/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ cc_defaults { 
    ],

}



cc_library {

cc_library_static {

    name: "libinstall",

    recovery_available: true,