summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libblkid/Android.mk13
-rw-r--r--prebuilt/Android.mk2
2 files changed, 6 insertions, 9 deletions
diff --git a/libblkid/Android.mk b/libblkid/Android.mk
index 630e0690f..ab20bf5ed 100644
--- a/libblkid/Android.mk
+++ b/libblkid/Android.mk
@@ -31,10 +31,9 @@ LOCAL_SRC_FILES = lib/at.c \
lib/strutils.c \
lib/sysfs.c \
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libfdisk/src \
+LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
- $(LOCAL_PATH)/libuuid/src \
- $(LOCAL_PATH)/src
+ $(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES += libc
include $(BUILD_SHARED_LIBRARY)
@@ -59,7 +58,7 @@ LOCAL_SRC_FILES = libuuid/src/clear.c \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/libuuid/src \
$(LOCAL_PATH)/include \
- $(LOCAL_PATH)/src
+ $(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES += libc libutil-linux
@@ -92,7 +91,7 @@ LOCAL_SRC_FILES = libfdisk/src/alignment.c \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/libfdisk/src \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/libuuid/src \
- $(LOCAL_PATH)/src
+ $(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES += libc libutil-linux libuuid
include $(BUILD_SHARED_LIBRARY)
@@ -189,7 +188,7 @@ LOCAL_SRC_FILES = src/cache.c \
src/topology/topology.c \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/src
+ $(LOCAL_PATH)/src
-LOCAL_SHARED_LIBRARIES += libc libfdisk libutil-linux
+LOCAL_SHARED_LIBRARIES += libc libutil-linux
include $(BUILD_SHARED_LIBRARY)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 8b1468ff6..a09c923b5 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -63,8 +63,6 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libminzip.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmtdutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtar.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libutil-linux.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libuuid.so
-RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfdisk.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libblkid.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmmcutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbmlutils.so