Stop building unneeded libs for libblkid
Change-Id: I96d91f2d2e38380ff46a6ff6e2c8c9a245aa0431
diff --git a/libblkid/Android.mk b/libblkid/Android.mk
index 630e069..ab20bf5 100644
--- a/libblkid/Android.mk
+++ b/libblkid/Android.mk
@@ -31,10 +31,9 @@
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_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_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 @@
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 8b1468f..a09c923 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -63,8 +63,6 @@
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