From 25bafe4739ae921fb72fb3d6c8e037611eba1686 Mon Sep 17 00:00:00 2001 From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 26 七月 2017 20:53:10 +0800 Subject: [PATCH] Failed commit: Default --- VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index ff5fa1a..8d749ce 100644 --- a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="/Users/zhangbo/home/work/DemoForBsk/app/src/main/jniLibs"/></dataSet><dataSet config="debug"><source path="/Users/zhangbo/home/work/DemoForBsk/app/src/debug/jniLibs"/></dataSet></merger> \ No newline at end of file +<merger version="3"><dataSet config="main"><source path="F:\workspace2\VisitFace\DemoForBsk\app\libs"><file name="FRICPayToolV20P.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\FRICPayToolV20P.jar"/><file name="libthrift-0.9.1.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\libthrift-0.9.1.jar"/><file name="slf4j-android-1.7.9.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\slf4j-android-1.7.9.jar"/><file name="slf4j-api-1.7.9.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\slf4j-api-1.7.9.jar"/><file name="universal-image-loader-1.9.2-SNAPSHOT-with-sources.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\universal-image-loader-1.9.2-SNAPSHOT-with-sources.jar"/><file name="xUtils-2.6.14.jar" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\xUtils-2.6.14.jar"/><file name="armeabi-v7a/libstlport_shared.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libstlport_shared.so"/><file name="armeabi-v7a/libfsdk.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libfsdk.so"/><file name="x86/libfsdk.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\x86\libfsdk.so"/><file name="x86/libstlport_shared.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\x86\libstlport_shared.so"/><file name="arm64-v8a/libfftw3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libfftw3.so"/><file name="armeabi/libcaffe-jni.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libcaffe-jni.so"/><file name="armeabi-v7a/libprotobuf.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libprotobuf.so"/><file name="armeabi/libfftw3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libfftw3.so"/><file name="armeabi-v7a/libopencv_java3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libopencv_java3.so"/><file name="armeabi-v7a/libprotoc.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libprotoc.so"/><file name="arm64-v8a/libprotobuf-lite.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libprotobuf-lite.so"/><file name="armeabi-v7a/libfftw3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libfftw3.so"/><file name="armeabi/libusb1.0.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libusb1.0.so"/><file name="armeabi-v7a/libcaffe-jni.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libcaffe-jni.so"/><file name="armeabi/libprotobuf-lite.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libprotobuf-lite.so"/><file name="arm64-v8a/librtspface.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\librtspface.so"/><file name="arm64-v8a/libprotobuf.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libprotobuf.so"/><file name="armeabi/libwltdecode.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libwltdecode.so"/><file name="armeabi-v7a/libreader.art.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libreader.art.so"/><file name="armeabi-v7a/libprotobuf-lite.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libprotobuf-lite.so"/><file name="arm64-v8a/libwltdecode.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libwltdecode.so"/><file name="armeabi-v7a/libusb1.0.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libusb1.0.so"/><file name="armeabi/libopencv_java3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libopencv_java3.so"/><file name="arm64-v8a/libusb1.0.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libusb1.0.so"/><file name="arm64-v8a/libcaffe-jni.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libcaffe-jni.so"/><file name="armeabi/libprotoc.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libprotoc.so"/><file name="armeabi/librtspface.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\librtspface.so"/><file name="arm64-v8a/libprotoc.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libprotoc.so"/><file name="arm64-v8a/libreader.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libreader.so"/><file name="armeabi/libreader.art.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libreader.art.so"/><file name="arm64-v8a/libreader.art.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libreader.art.so"/><file name="armeabi/libreader.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libreader.so"/><file name="armeabi-v7a/libreader.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libreader.so"/><file name="armeabi/libcvface_api.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libcvface_api.so"/><file name="arm64-v8a/libcvface_api.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libcvface_api.so"/><file name="armeabi-v7a/librtspface.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\librtspface.so"/><file name="arm64-v8a/libopencv_java3.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\arm64-v8a\libopencv_java3.so"/><file name="armeabi/libprotobuf.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi\libprotobuf.so"/><file name="armeabi-v7a/libwltdecode.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libwltdecode.so"/><file name="armeabi-v7a/libcvface_api.so" path="F:\workspace2\VisitFace\DemoForBsk\app\libs\armeabi-v7a\libcvface_api.so"/></source></dataSet><dataSet config="debug"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\debug\jniLibs"/></dataSet></merger> \ No newline at end of file -- Gitblit v1.8.0