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

Commit 1bf401d0 authored by Bill Peckham's avatar Bill Peckham Committed by android-build-merger
Browse files

Merge "Moving recovery resources from /system to /vendor" 

am: 3903b263

Change-Id: I477c2cbe802fff389a8e333ea693859d9a21a63e
parents 7018c5b2 3903b263

CleanSpec.mk

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,14 @@ $(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)



# Move recovery resources from /system to /vendor.

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/bin/applypatch)

$(call add-clean-step, rm -r $(PRODUCT_OUT)/symbols/system/bin/applypatch)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/*-target_files-*/SYSTEM/bin/applypatch)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/*-target_files-*/SYSTEM/bin/install-recovery.sh)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/*-target_files-*/SYSTEM/etc/recovery-resource.dat)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/*-target_files-*/SYSTEM/recovery-from-boot.p)



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

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

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

applypatch/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ cc_library_static { 
    name: "libapplypatch",



    host_supported: true,

    vendor_available: true,



    defaults: [

        "applypatch_defaults",
@@ -69,6 +70,7 @@ cc_library_static { 


cc_library_static {

    name: "libapplypatch_modes",

    vendor_available: true,



    defaults: [

        "applypatch_defaults",
@@ -92,6 +94,7 @@ cc_library_static { 


cc_binary {

    name: "applypatch",

    vendor: true,



    defaults: [

        "applypatch_defaults",
@@ -120,6 +123,10 @@ cc_binary { 
        "libz",

        "libziparchive",

    ],



    init_rc: [

        "vendor_flash_recovery.rc",

    ],

}



cc_library_host_static {

applypatch/applypatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ bool PatchPartition(const Partition& target, const Partition& source, const Valu 
  }



  FileContents source_file;

  if (ReadPartitionToBuffer(source, &source_file, true)) {

  if (ReadPartitionToBuffer(source, &source_file, backup_source)) {

    return GenerateTarget(target, source_file, patch, bonus, backup_source);

  }

applypatch/vendor_flash_recovery.rc

0 → 100644
+3 −0
Original line number Diff line number Diff line 
service vendor_flash_recovery /vendor/bin/install-recovery.sh

    class main

    oneshot

edify/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ cc_library_static { 
    name: "libedify",



    host_supported: true,

    vendor_available: true,



    srcs: [

        "expr.cpp",