From 23c3323984f984d36248f107a320a8717b430049 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 21 三月 2017 16:23:01 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json
index ff5a15e..cac9ba1 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json
@@ -28,6 +28,12 @@
{
"flags" : " -target i686-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86 -Drtspface_EXPORTS -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\UsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\JniHelpers\\src\\main\\cpp -ID:\\workspace\\proxy\\RtspFace -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\x86\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86"
+ },
+
+ {
+ "flags" : " -target i686-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86 -Drtspface_EXPORTS -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\UsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\JniHelpers\\src\\main\\cpp -ID:\\workspace\\proxy\\RtspFace -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\x86\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PipeLine.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86"
},
@@ -47,12 +53,6 @@
{
"flags" : " -target i686-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86 -Drtspface_EXPORTS -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\UsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\JniHelpers\\src\\main\\cpp -ID:\\workspace\\proxy\\RtspFace -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\x86\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp",
- "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86"
- },
-
- {
- "flags" : " -target i686-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86 -Drtspface_EXPORTS -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\live555\\include\\UsageEnvironment -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\JniHelpers\\src\\main\\cpp -ID:\\workspace\\proxy\\RtspFace -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\x86\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -std=c++11 -Wall -UNDEBUG -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
- "src" : "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86"
}
],
--
Gitblit v1.8.0