Galaxy S initial support. Fix firmware flash on inc. May need to fix other phones.
diff --git a/Android.mk b/Android.mk
index 1de07d6..ddb2012 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,8 @@
LOCAL_CFLAGS += -DBOARD_HAS_NO_MISC_PARTITION
endif
-ifdef BOARD_USES_FFORMAT
- LOCAL_CFLAGS += -DBOARD_USES_FFORMAT
-endif
-
ifdef BOARD_RECOVERY_IGNORE_BOOTABLES
- LOCAL_CLFAGS += -DBOARD_RECOVERY_IGNORE_BOOTABLES
+ LOCAL_CFLAGS += -DBOARD_RECOVERY_IGNORE_BOOTABLES
endif
LOCAL_SRC_FILES += test_roots.c
@@ -101,6 +97,26 @@
LOCAL_CFLAGS += -DHAS_DATADATA
endif
+ifdef BOARD_DATA_FILESYSTEM_OPTIONS
+ LOCAL_CFLAGS += -DDATA_FILESYSTEM_OPTIONS=\"$(BOARD_DATA_FILESYSTEM_OPTIONS)\"
+endif
+
+ifdef BOARD_DATADATA_FILESYSTEM_OPTIONS
+ LOCAL_CFLAGS += -DDATADATA_FILESYSTEM_OPTIONS=\"$(BOARD_DATADATA_FILESYSTEM_OPTIONS)\"
+endif
+
+ifdef BOARD_CACHE_FILESYSTEM_OPTIONS
+ LOCAL_CFLAGS += -DCACHE_FILESYSTEM_OPTIONS=\"$(BOARD_CACHE_FILESYSTEM_OPTIONS)\"
+endif
+
+ifdef BOARD_SYSTEM_FILESYSTEM_OPTIONS
+ LOCAL_CFLAGS += -DSYSTEM_FILESYSTEM_OPTIONS=\"$(BOARD_SYSTEM_FILESYSTEM_OPTIONS)\"
+endif
+
+ifdef BOARD_HAS_MTD_CACHE
+ LOCAL_CFLAGS += -DBOARD_HAS_MTD_CACHE
+endif
+
# This binary is in the recovery ramdisk, which is otherwise a copy of root.
# It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses
# a (redundant) copy of the binary in /system/bin for user builds.
@@ -163,16 +179,6 @@
LOCAL_SRC_FILES := killrecovery.sh
include $(BUILD_PREBUILT)
-ifdef BOARD_USES_FFORMAT
-include $(CLEAR_VARS)
-LOCAL_MODULE := fformat
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_SRC_FILES := prebuilt/fformat
-include $(BUILD_PREBUILT)
-endif
-
include $(commands_recovery_local_path)/amend/Android.mk
include $(commands_recovery_local_path)/minui/Android.mk
include $(commands_recovery_local_path)/minzip/Android.mk