parted: fix building issues on Android 6.0

diff --git a/Android.mk b/Android.mk
index 8338432..5053e7d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1 @@
 include $(call all-subdir-makefiles)
-

diff --git a/include/config.h b/include/config.h
index ef5633d..3e70a24 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -21,10 +21,13 @@
 #define HAVE_WCHAR_H
 #define HAVE_DECL_STRERROR_R 1
 #define HAVE_DECL___FPENDING 0
+#define HAVE_LONG_LONG_INT 1
 
+#ifdef __LP64__
+#define SIZEOF_OFF_T 8
+#else
 #define SIZEOF_OFF_T 4
-
-#define linux
+#endif
 
 #define S_IREAD     S_IRUSR
 #define S_IWRITE    S_IWUSR

diff --git a/libparted/Android.mk b/libparted/Android.mk
index f9e0476..744eae4 100644 (file)
--- a/libparted/Android.mk
+++ b/libparted/Android.mk
@@ -36,8 +36,6 @@ LOCAL_STATIC_LIBRARIES := libgnulib libparted-fs
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../lib \
        external/e2fsprogs/lib \
-       fs \
-       labels
 
 include $(BUILD_STATIC_LIBRARY)
 

diff --git a/libparted/device.c b/libparted/device.c
index 738b320..9de766f 100644 (file)
--- a/libparted/device.c
+++ b/libparted/device.c
@@ -154,7 +154,7 @@ ped_device_get (const char* path)
        PED_ASSERT (path != NULL);
        /* Don't canonicalize /dev/mapper paths, see tests/symlink.c */
        if (strncmp (path, "/dev/mapper/", 12))
-               normal_path = canonicalize_file_name (path);
+               normal_path = realpath(path, NULL);
        if (!normal_path)
                /* Well, maybe it is just that the file does not exist.
                 * Try it anyway.  */