From 9bb7c225a47fa6903c574250d92b8eef8c0ba2c1 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 13 Jul 2018 23:12:29 +0300 Subject: Don't copy local mke2fs.conf for O-MR1 * It is now copied from system/extras/ext4_utils Change-Id: Ibddcad4928c17bc174390d75708a5382a9262441 --- prebuilt/Android.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index a7208a228..0b0fa8613 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -406,13 +406,15 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) #mke2fs.conf -include $(CLEAR_VARS) -LOCAL_MODULE := mke2fs.conf -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/etc -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 26; echo $$?),0) + include $(CLEAR_VARS) + LOCAL_MODULE := mke2fs.conf + LOCAL_MODULE_TAGS := eng + LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/etc + LOCAL_SRC_FILES := $(LOCAL_MODULE) + include $(BUILD_PREBUILT) +endif ifeq ($(BOARD_HAS_NO_REAL_SDCARD),) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) -- cgit v1.2.3