summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2012-07-18 12:03:33 -0700
committerJoe Onorato <joeo@google.com>2012-08-15 19:52:52 -0700
commit2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59 (patch)
tree2473447824b08c5831e2395b0164723588ad7363 /fastboot
parent2290dd418b4ddcb12027fa4616affe64eb92ad1e (diff)
downloadsystem_core-2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59.zip
system_core-2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59.tar.gz
system_core-2ffe3c8ac4b0d5a0716c4b131743b5983c99ce59.tar.bz2
libext4_utils on host is now called libext4_utils_host so there is no name conflict
Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/Android.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index e3261a7..b6fbd3f 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -48,7 +48,13 @@ ifeq ($(HOST_OS),windows)
LOCAL_C_INCLUDES += development/host/windows/usb/api
endif
-LOCAL_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz libext4_utils libsparse libz
+LOCAL_STATIC_LIBRARIES := \
+ $(EXTRA_STATIC_LIBS) \
+ libzipfile \
+ libunz \
+ libext4_utils_host \
+ libsparse \
+ libz
ifneq ($(HOST_OS),windows)
ifeq ($(HAVE_SELINUX), true)