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

Commit 7f9d29bd authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Remove e2fsdroid and sload_f2fs dep from fastboot" am: 8a6fa312 am:... 

Merge "Remove e2fsdroid and sload_f2fs dep from fastboot" am: 8a6fa312 am: 4f0ad3a9 am: d7f0db58

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2182995



Change-Id: Ide08673438f1cda03d8980918b94e59b62cdaa29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cb874df d7f0db58

fastboot/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -346,9 +346,7 @@ cc_binary_host { 
    target: {

        not_windows: {

            required: [

                "e2fsdroid",

                "mke2fs.conf",

                "sload_f2fs",

            ],

        },

        windows: {

fastboot/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ LOCAL_PATH:= $(call my-dir) 
#



my_dist_files := $(HOST_OUT_EXECUTABLES)/mke2fs

my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid

my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs

my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs_casefold

my_dist_files += $(HOST_OUT_EXECUTABLES)/sload_f2fs

$(call dist-for-goals,dist_files sdk,$(my_dist_files))

my_dist_files :=