Don't define modules for recovery

These modules are not used by us. The rules are even broken since
some required modules are not defined in our source tree.
Before Android 8.1 these rules are just skipped. However, they are
not valid since Android 8.1.

diff --git a/fsck/Android.mk b/fsck/Android.mk
index 85fea70..867cf92 100644 (file)
--- a/fsck/Android.mk
+++ b/fsck/Android.mk
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := main.c
 LOCAL_SHARED_LIBRARIES := libexfat libfuse-lite
 include $(BUILD_EXECUTABLE)
 
+ifneq ($(TARGET_NO_RECOVERY),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libexfat_fsck_static
 LOCAL_MODULE_TAGS := optional
@@ -16,4 +17,4 @@ LOCAL_SRC_FILES := main.c
 LOCAL_C_INCLUDES := external/fuse/include
 LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
 include $(BUILD_STATIC_LIBRARY)
-
+endif

diff --git a/fuse/Android.mk b/fuse/Android.mk
index 492bff2..5857c09 100644 (file)
--- a/fuse/Android.mk
+++ b/fuse/Android.mk
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := main.c
 LOCAL_SHARED_LIBRARIES := libexfat libfuse-lite
 include $(BUILD_EXECUTABLE)
 
+ifneq ($(TARGET_NO_RECOVERY),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libexfat_mount_static
 LOCAL_MODULE_TAGS := optional
@@ -17,3 +18,4 @@ LOCAL_C_INCLUDES := external/fuse/include \
                                        external/fuse/android
 LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
 include $(BUILD_STATIC_LIBRARY)
+endif

diff --git a/libexfat/Android.mk b/libexfat/Android.mk
index ef0485c..4066799 100644 (file)
--- a/libexfat/Android.mk
+++ b/libexfat/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
 
+ifneq ($(TARGET_NO_RECOVERY),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libexfat_static
 LOCAL_MODULE_TAGS := optional
@@ -18,3 +19,4 @@ LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
 include $(BUILD_STATIC_LIBRARY)
+endif

diff --git a/mkfs/Android.mk b/mkfs/Android.mk
index 2559101..a386f3e 100644 (file)
--- a/mkfs/Android.mk
+++ b/mkfs/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_SHARED_LIBRARIES := libexfat libfuse-lite
 include $(BUILD_EXECUTABLE)
 
+ifneq ($(TARGET_NO_RECOVERY),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libexfat_mkfs_static
 LOCAL_MODULE_TAGS := optional
@@ -18,3 +19,4 @@ LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_C_INCLUDES := external/fuse/include
 LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
 include $(BUILD_STATIC_LIBRARY)
+endif