From 7a77aec36218966e80e99c980dff81331600b92f Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 9 Nov 2010 09:23:15 -0800 Subject: [PATCH] fix mmcutils usage Change-Id: I04db586599af21f64174b0e656201c724bf82050 --- Android.mk | 4 ++++ roots.h | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index d9ac788..80fa6d3 100644 --- a/Android.mk +++ b/Android.mk @@ -130,6 +130,10 @@ ifdef BOARD_USES_BMLUTILS LOCAL_STATIC_LIBRARIES += libbmlutils endif +ifdef BOARD_USES_MMCUTILS + LOCAL_CFLAGS += -DBOARD_USES_MMCUTILS +endif + ifdef BOARD_HAS_SMALL_RECOVERY LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY endif diff --git a/roots.h b/roots.h index 64d7281..5018e9f 100644 --- a/roots.h +++ b/roots.h @@ -21,6 +21,12 @@ #include "minzip/Zip.h" #include "mtdutils/mtdutils.h" +#ifndef BOARD_USES_BMLUTILS +#define DEFAULT_DEVICE g_mtd_device +#else +#define DEFAULT_DEVICE g_mmc_device +#endif + #ifndef SDCARD_DEVICE_PRIMARY #define SDCARD_DEVICE_PRIMARY "/dev/block/mmcblk0p1" #endif @@ -38,7 +44,7 @@ #endif #ifndef DATA_DEVICE -#define DATA_DEVICE g_mtd_device +#define DATA_DEVICE DEFAULT_DEVICE #endif #ifndef DATA_FILESYSTEM @@ -46,7 +52,7 @@ #endif #ifndef DATADATA_DEVICE -#define DATADATA_DEVICE g_mtd_device +#define DATADATA_DEVICE DEFAULT_DEVICE #endif #ifndef DATADATA_FILESYSTEM @@ -54,7 +60,7 @@ #endif #ifndef CACHE_DEVICE -#define CACHE_DEVICE g_mtd_device +#define CACHE_DEVICE DEFAULT_DEVICE #endif #ifndef CACHE_FILESYSTEM @@ -62,7 +68,7 @@ #endif #ifndef SYSTEM_DEVICE -#define SYSTEM_DEVICE g_mtd_device +#define SYSTEM_DEVICE DEFAULT_DEVICE #endif #ifndef SYSTEM_FILESYSTEM