From eb69d9c33b307bfc2d6c7f46a210f98c5fa306c5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 14:31:01 +0800
Subject: [PATCH] bug fix for client
---
VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json b/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
index f6c1c41..855d05c 100644
--- a/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
+++ b/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
@@ -1,9 +1,9 @@
{
- "buildFiles" : [ "D:/work/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt" ],
+ "buildFiles" : [ "F:/workspace2/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt" ],
"cleanCommands" :
[
- "D:\\AppData\\Local\\Android\\sdk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\work\\VisitFace\\DemoForBsk\\app\\.externalNativeBuild\\cmake\\debug\\armeabi-v7a --target clean"
+ "D:\\program\\android\\sdk1\\cmake\\3.6.3155560\\bin\\cmake.exe --build F:\\workspace2\\VisitFace\\DemoForBsk\\app\\.externalNativeBuild\\cmake\\debug\\armeabi-v7a --target clean"
],
"cppFileExtensions" : [ "cpp" ],
"libraries" :
@@ -12,33 +12,33 @@
{
"abi" : "armeabi-v7a",
"artifactName" : "native-codec-jni",
- "buildCommand" : "D:\\AppData\\Local\\Android\\sdk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\work\\VisitFace\\DemoForBsk\\app\\.externalNativeBuild\\cmake\\debug\\armeabi-v7a --target native-codec-jni",
+ "buildCommand" : "D:\\program\\android\\sdk1\\cmake\\3.6.3155560\\bin\\cmake.exe --build F:\\workspace2\\VisitFace\\DemoForBsk\\app\\.externalNativeBuild\\cmake\\debug\\armeabi-v7a --target native-codec-jni",
"buildType" : "debug",
"files" :
[
{
- "flags" : " -target armv7-none-linux-androideabi -gcc-toolchain D:/AppData/Local/Android/sdk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64 --sysroot=D:/AppData/Local/Android/sdk/ndk-bundle/platforms/android-21/arch-arm -Dnative_codec_jni_EXPORTS -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fno-integrated-as -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fno-integrated-as -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O0 -fno-limit-debug-info -O0 -fno-limit-debug-info -fPIC -c ",
- "src" : "D:/work/VisitFace/DemoForBsk/app/src/main/cpp/looper.cpp",
- "workingDirectory" : "D:/work/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
+ "flags" : " --sysroot=D:/program/android/sdk1/ndk-bundle/platforms/android-21/arch-arm -Dnative_codec_jni_EXPORTS -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -std=c++11 -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
+ "src" : "F:/workspace2/VisitFace/DemoForBsk/app/src/main/cpp/looper.cpp",
+ "workingDirectory" : "F:/workspace2/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
},
{
- "flags" : " -target armv7-none-linux-androideabi -gcc-toolchain D:/AppData/Local/Android/sdk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64 --sysroot=D:/AppData/Local/Android/sdk/ndk-bundle/platforms/android-21/arch-arm -Dnative_codec_jni_EXPORTS -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\AppData\\Local\\Android\\sdk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fno-integrated-as -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fno-integrated-as -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O0 -fno-limit-debug-info -O0 -fno-limit-debug-info -fPIC -c ",
- "src" : "D:/work/VisitFace/DemoForBsk/app/src/main/cpp/native-codec-jni.cpp",
- "workingDirectory" : "D:/work/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
+ "flags" : " --sysroot=D:/program/android/sdk1/ndk-bundle/platforms/android-21/arch-arm -Dnative_codec_jni_EXPORTS -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\program\\android\\sdk1\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -std=c++11 -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
+ "src" : "F:/workspace2/VisitFace/DemoForBsk/app/src/main/cpp/native-codec-jni.cpp",
+ "workingDirectory" : "F:/workspace2/VisitFace/DemoForBsk/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
}
],
- "output" : "D:/work/VisitFace/DemoForBsk/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libnative-codec-jni.so",
- "toolchain" : "4100436765"
+ "output" : "F:/workspace2/VisitFace/DemoForBsk/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libnative-codec-jni.so",
+ "toolchain" : "3532233539"
}
},
"toolchains" :
{
- "4100436765" :
+ "3532233539" :
{
- "cCompilerExecutable" : "D:/AppData/Local/Android/sdk/ndk-bundle/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe",
- "cppCompilerExecutable" : "D:/AppData/Local/Android/sdk/ndk-bundle/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
+ "cCompilerExecutable" : "D:/program/android/sdk1/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/arm-linux-androideabi-gcc.exe",
+ "cppCompilerExecutable" : "D:/program/android/sdk1/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/arm-linux-androideabi-g++.exe"
}
}
}
--
Gitblit v1.8.0