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

Commit ea76ccba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert recovery_deps to Android.bp" into main am: 78d309ba am: 34da23e4 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3370467



Change-Id: I5c8080a46b847619d962962fb7a46294840a16e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2519af66 34da23e4

Android.bp

+26 −0
Original line number Diff line number Diff line
@@ -257,3 +257,29 @@ filegroup { 
        "res-*/images/*_text.png",

    ],

}



// recovery_deps: A phony target that's depended on by `recovery`, which

// builds additional modules conditionally based on Makefile variables.

phony {

    name: "recovery_deps",

    required: [

        "mkfs.erofs.recovery",

        "dump.erofs.recovery",

        "fsck.erofs.recovery",

        // On A/B devices recovery-persist reads the recovery related file from the persist storage and

        // copies them into /data/misc/recovery. Then, for both A/B and non-A/B devices, recovery-persist

        // parses the last_install file and reports the embedded update metrics. Also, the last_install file

        // will be deteleted after the report.

        "recovery-persist",

    ] + select(soong_config_variable("recovery", "target_userimages_use_f2fs"), {

        true: [

            "make_f2fs.recovery",

            "fsck.f2fs.recovery",

            "sload_f2fs.recovery",

        ],

        default: [],

    }) + select(soong_config_variable("recovery", "has_board_cacheimage_partition_size"), {

        false: ["recovery-refresh"],

        default: [],

    }),

}

Android.mk

+0 −34
Original line number Diff line number Diff line
@@ -47,37 +47,3 @@ LOCAL_SHARED_LIBRARIES := \ 
    librecovery_ui.recovery



include $(BUILD_SHARED_LIBRARY)
 


# recovery_deps: A phony target that's depended on by `recovery`, which

# builds additional modules conditionally based on Makefile variables.

# ======================================================================

include $(CLEAR_VARS)



LOCAL_MODULE := recovery_deps

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL

LOCAL_LICENSE_CONDITIONS := by_exception_only notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE



ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)

LOCAL_REQUIRED_MODULES += \

    make_f2fs.recovery \

    fsck.f2fs.recovery \

    sload_f2fs.recovery

endif



LOCAL_REQUIRED_MODULES += \

    mkfs.erofs.recovery \

    dump.erofs.recovery \

    fsck.erofs.recovery



# On A/B devices recovery-persist reads the recovery related file from the persist storage and

# copies them into /data/misc/recovery. Then, for both A/B and non-A/B devices, recovery-persist

# parses the last_install file and reports the embedded update metrics. Also, the last_install file

# will be deteleted after the report.

LOCAL_REQUIRED_MODULES += recovery-persist

ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)

LOCAL_REQUIRED_MODULES += recovery-refresh

endif



include $(BUILD_PHONY_PACKAGE)