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

Commit 5108b0b7 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "applypatch: Use static libs for libbrotli and libbz." 

am: 4f86af7b

Change-Id: If7c24567470f842da95ea339f691a355c4402da9
parents e9788bc3 4f86af7b

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/testcases/recovery_component_test) 
$(call add-clean-step, find $(OUT_DIR) -type f -name "SystemUpdaterSample*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUpdaterSample)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libbrotli.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libbz.so)



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

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

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

applypatch/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -106,13 +106,15 @@ cc_binary { 
        "libapplypatch",

        "libedify",

        "libotautil",



        // External dependencies.

        "libbspatch",

        "libbrotli",

        "libbz",

    ],



    shared_libs: [

        "libbase",

        "libbrotli",

        "libbz",

        "libcrypto",

        "liblog",

        "libz",