更新所有版本依赖

yong718100 · Jul 18, 2017 · 171e5c9 · 171e5c9
1 parent 52ac30c
commit 171e5c9
Show file tree

Hide file tree

Showing 38 changed files with 693 additions and 509 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,5 @@
 *.exe
 *.out
 *.app
+.DS_Store
+workspace.xml
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "libiconv-android"]
-	path = libiconv-android
-	url = https://github.com/xxDroid/libiconv-android.git
-[submodule "libxml2-android"]
-	path = libxml2-android
-	url = https://github.com/xxDroid/libxml2-android.git
 [submodule "openssl-android"]
 	path = openssl-android
 	url = https://github.com/xxDroid/openssl-android.git

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/install.sh b/android/install.sh
@@ -16,7 +16,7 @@ adb shell su -c "mkdir /var/run"
 
 # Install so
 echo "----------Install so--------------"
-for S in libiconv.so libxml2.so libplist.so libplist++.so libusb.so libusbmuxd.so libcrypto.so libssl.so libimobiledevice.so libzip.so
+for S in libplist.so libplist++.so libusb.so libusbmuxd.so libcrypto.so libssl.so libimobiledevice.so libzip.so
 do
 #  adb shell rm "$PATH_DEVICE_LIB/$S"
   adb push "$PATH_LOCAL_LIB/$S" $PATH_DEVICE_LIB

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
-include $(LOCAL_PATH)/libiconv.mk
-include $(LOCAL_PATH)/libxml2.mk
+#include $(LOCAL_PATH)/libiconv.mk
+#include $(LOCAL_PATH)/libxml2.mk
 include $(LOCAL_PATH)/libplist.mk
 include $(LOCAL_PATH)/libusbmuxd.mk
 

diff --git a/android/jni/libiconv.mk b/android/jni/libiconv.mk
diff --git a/android/jni/libimobiledevice.mk b/android/jni/libimobiledevice.mk
@@ -134,7 +134,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := -DHAVE_OPENSSL
- 
+
 LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/tools/idevicepair.c
 
@@ -157,7 +157,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := \
  -DHAVE_OPENSSL
- 
+
 LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/tools/idevicedate.c
 
@@ -180,7 +180,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := \
  -DHAVE_OPENSSL
- 
+
 LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/tools/idevicediagnostics.c
 
@@ -203,7 +203,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := \
  -DHAVE_OPENSSL
- 
+
 LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/tools/idevicescreenshot.c
 
@@ -226,7 +226,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := \
  -DHAVE_OPENSSL
- 
+
 LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/tools/idevicesyslog.c
 

diff --git a/android/jni/libplist.mk b/android/jni/libplist.mk
@@ -40,22 +40,15 @@ LOCAL_SRC_FILES := \
  $(LIB_ROOT_REL)/src/ptrarray.c \
  $(LIB_ROOT_REL)/src/bplist.c \
  $(LIB_ROOT_REL)/src/base64.c \
- $(LIB_ROOT_REL)/src/xplist.c
+ $(LIB_ROOT_REL)/src/xplist.c \
+ $(LIB_ROOT_REL)/src/time64.c
 
 LOCAL_C_INCLUDES := \
  $(LIB_ROOT_ABS)/src \
  $(LIB_ROOT_ABS)/include \
- $(LIB_ROOT_ABS)/libcnary/include \
- $(LIB_ROOT_ABS)/../$(LIB_XML_VERSION) \
- $(LIB_ROOT_ABS)/../$(LIB_XML_VERSION)/include \
- $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION) \
- $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/include \
- $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/lib \
- $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/libcharset \
- $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/libcharset/include
+ $(LIB_ROOT_ABS)/libcnary/include
 
 LOCAL_STATIC_LIBRARIES := libcnary
-LOCAL_SHARED_LIBRARIES := libiconv libxml2
 
 LOCAL_MODULE := libplist
 
@@ -93,7 +86,7 @@ LOCAL_C_INCLUDES := \
  $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/libcharset/include
 
 LOCAL_STATIC_LIBRARIES := libcnary
-LOCAL_SHARED_LIBRARIES := libiconv libxml2 libplist
+LOCAL_SHARED_LIBRARIES := libplist
 
 LOCAL_MODULE := libplist++
 
@@ -122,7 +115,7 @@ LOCAL_C_INCLUDES := \
  $(LIB_ROOT_ABS)/../$(LIB_ICONV_VERSION)/libcharset/include
 
 LOCAL_STATIC_LIBRARIES := libcnary
-LOCAL_SHARED_LIBRARIES := libiconv libxml2 libplist
+LOCAL_SHARED_LIBRARIES := libplist
 
 LOCAL_MODULE := plistutil
 

diff --git a/android/jni/libusbmuxd.mk b/android/jni/libusbmuxd.mk
@@ -12,15 +12,15 @@ include $(CLEAR_VARS)
 LOCAL_CFLAGS := -O2 -Wall -fPIC -lpthread -Dlibusbmuxd_EXPORTS -DHAVE_INOTIFY -DSO_NOSIGPIPE
 
 LOCAL_SRC_FILES := \
- $(LIB_ROOT_REL)/src/collection.c \
- $(LIB_ROOT_REL)/src/libusbmuxd.c \
- $(LIB_ROOT_REL)/src/socket.c
+ $(LIB_ROOT_REL)/common/collection.c \
+ $(LIB_ROOT_REL)/common/socket.c \
+ $(LIB_ROOT_REL)/src/libusbmuxd.c
 
 LOCAL_C_INCLUDES += \
  $(LOCAL_PATH)/.. \
+ $(LIB_ROOT_ABS)/common \
  $(LIB_ROOT_ABS)/include \
- $(LIB_ROOT_ABS)/src \
- $(LIB_ROOT_ABS)/../$(LIB_PLIST_VERSION)/include 
+ $(LIB_ROOT_ABS)/../$(LIB_PLIST_VERSION)/include
 
 LOCAL_SHARED_LIBRARIES := libc libplist
 LOCAL_LDLIBS := -llog
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_C_INCLUDES += \
  $(LIB_ROOT_ABS)/include \
- $(LIB_ROOT_ABS)/src
+ $(LIB_ROOT_ABS)/common
 
 LOCAL_SHARED_LIBRARIES := libc libusbmuxd
 

diff --git a/android/jni/libusbx.mk b/android/jni/libusbx.mk
diff --git a/android/jni/libxml2.mk b/android/jni/libxml2.mk
diff --git a/android/jni/usbmuxd.mk b/android/jni/usbmuxd.mk
@@ -12,7 +12,7 @@ LIB_ROOT_ABS:= $(LOCAL_PATH)/../../$(LIB_VERSION)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -O2 -Wall -lpthread -DPACKAGE_STRING=\"1.0.9\" -DPACKAGE_VERSION=\"1.0.9\" -DPACKAGE_NAME=\"usbmuxd\" -DHAVE_LIBIMOBILEDEVICE
+LOCAL_CFLAGS := -O2 -Wall -lpthread -DPACKAGE_STRING=\"1.0.9\" -DPACKAGE_VERSION=\"1.0.9\" -DPACKAGE_NAME=\"usbmuxd\" -DHAVE_LIBIMOBILEDEVICE -DHAVE_CLOCK_GETTIME
 
 LOCAL_SRC_FILES:= \
  $(LIB_ROOT_REL)/src/log.c \
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES:= \
  $(LIB_ROOT_REL)/src/device.c \
  $(LIB_ROOT_REL)/src/main.c \
  $(LIB_ROOT_REL)/src/preflight.c \
- $(LIB_ROOT_REL)/src/usb-linux.c \
+ $(LIB_ROOT_REL)/src/usb.c \
  $(LIB_ROOT_REL)/src/utils.c
 
 LOCAL_C_INCLUDES += \

diff --git a/android/libs/armeabi-v7a/fusermount b/android/libs/armeabi-v7a/fusermount
diff --git a/android/libs/armeabi-v7a/idevicecrashreport b/android/libs/armeabi-v7a/idevicecrashreport
diff --git a/android/libs/armeabi-v7a/idevicedate b/android/libs/armeabi-v7a/idevicedate
diff --git a/android/libs/armeabi-v7a/idevicediagnostics b/android/libs/armeabi-v7a/idevicediagnostics
diff --git a/android/libs/armeabi-v7a/ideviceid b/android/libs/armeabi-v7a/ideviceid
diff --git a/android/libs/armeabi-v7a/ideviceinfo b/android/libs/armeabi-v7a/ideviceinfo
diff --git a/android/libs/armeabi-v7a/ideviceinstaller b/android/libs/armeabi-v7a/ideviceinstaller
diff --git a/android/libs/armeabi-v7a/idevicename b/android/libs/armeabi-v7a/idevicename
diff --git a/android/libs/armeabi-v7a/idevicepair b/android/libs/armeabi-v7a/idevicepair
diff --git a/android/libs/armeabi-v7a/idevicescreenshot b/android/libs/armeabi-v7a/idevicescreenshot
diff --git a/android/libs/armeabi-v7a/idevicesyslog b/android/libs/armeabi-v7a/idevicesyslog
diff --git a/android/libs/armeabi-v7a/ifuse b/android/libs/armeabi-v7a/ifuse
diff --git a/android/libs/armeabi-v7a/iproxy b/android/libs/armeabi-v7a/iproxy
diff --git a/android/libs/armeabi-v7a/listdevs b/android/libs/armeabi-v7a/listdevs
diff --git a/android/libs/armeabi-v7a/openssl b/android/libs/armeabi-v7a/openssl
diff --git a/android/libs/armeabi-v7a/plistutil b/android/libs/armeabi-v7a/plistutil
diff --git a/android/libs/armeabi-v7a/usbmuxdd b/android/libs/armeabi-v7a/usbmuxdd
diff --git a/ideviceinstaller b/ideviceinstaller
diff --git a/ifuse b/ifuse
diff --git a/libiconv-android b/libiconv-android
diff --git a/libimobiledevice b/libimobiledevice
diff --git a/libplist b/libplist
diff --git a/libusb b/libusb
diff --git a/libusbmuxd b/libusbmuxd
diff --git a/libxml2-android b/libxml2-android
diff --git a/usbmuxd b/usbmuxd
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,5 @@ @@
     *.exe
     *.out
     *.app
+    .DS_Store
+    workspace.xml
+3 −0		AUTHORS
+34 −0		NEWS
+9 −3		README
+24 −21		configure.ac
+14 −7		man/ideviceinstaller.1
+231 −188		src/ideviceinstaller.c