aboutsummaryrefslogtreecommitdiffstats
path: root/heimdall/source
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-08-14 09:59:55 -0700
committerKoushik Dutta <koushd@gmail.com>2013-08-14 09:59:55 -0700
commitc82df274ecea32cd6528f070a21528bf80a2f466 (patch)
tree16f70162cd3d60920693b4591c842e84e916014e /heimdall/source
parentd6bd426258b48264ed1b8c589ecb5ff1f179a88d (diff)
downloadexternal_heimdall-c82df274ecea32cd6528f070a21528bf80a2f466.zip
external_heimdall-c82df274ecea32cd6528f070a21528bf80a2f466.tar.gz
external_heimdall-c82df274ecea32cd6528f070a21528bf80a2f466.tar.bz2
switch to libusbx
Change-Id: I91cb1d3fb05c34c9da19d870da3158220628e883
Diffstat (limited to 'heimdall/source')
-rw-r--r--heimdall/source/Android.mk30
1 files changed, 2 insertions, 28 deletions
diff --git a/heimdall/source/Android.mk b/heimdall/source/Android.mk
index 86d2310..9d015b9 100644
--- a/heimdall/source/Android.mk
+++ b/heimdall/source/Android.mk
@@ -3,30 +3,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- core.c \
- descriptor.c \
- io.c \
- sync.c
-
-ifeq ($(HOST_OS),darwin)
-LOCAL_SRC_FILES += os/darwin_usb.c
-endif
-ifeq ($(HOST_OS),linux)
-LOCAL_SRC_FILES += os/linux_usbfs.c
-endif
-
-LOCAL_SRC_FILES := $(addprefix ../../../libusb/libusb/,$(LOCAL_SRC_FILES))
-LOCAL_MODULE := libusb
-
-LOCAL_C_INCLUDES := \
- external/libusb \
- external/libusb/libusb
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
Arguments.cpp \
ClosePcScreenAction.cpp \
DownloadPitAction.cpp \
@@ -43,13 +19,11 @@ LOCAL_SRC_FILES := \
main.cpp \
../../libpit/Source/libpit.cpp
-LOCAL_SRC_FILES += $(LIBUSB_SRC_FILES)
-
LOCAL_C_INCLUDES := \
external/heimdall/libpit/Source \
- external/libusb/libusb
+ external/libusbx/libusb
-LOCAL_STATIC_LIBRARIES := libusb
+LOCAL_STATIC_LIBRARIES := libusbx
ifeq ($(HOST_OS),darwin)
LOCAL_LDFLAGS := -framework CoreFoundation -framework IOKit