From 6945c922494798b8f5f3843f8c675d15b1b2bfd1 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 14:58:20 +0800
Subject: [PATCH] add armv8 lib
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 904c81a..238c0a2 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -10,10 +10,20 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/lib/arm64-v8a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/lib/arm64-v8a/libyuv_static.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/live555/lib/arm64-v8a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/live555/lib/arm64-v8a/libBasicUsageEnvironment.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/live555/lib/arm64-v8a/libUsageEnvironment.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/live555/lib/arm64-v8a/libgroupsock.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/live555/lib/arm64-v8a/libliveMedia.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/opencv/lib/arm64-v8a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/opencv/lib/arm64-v8a/libopencv_java3.so" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists_armv7.txt" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists_mdeiacodecjava.txt" />
<change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_proto.h" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_server.cpp" afterPath="" />
@@ -60,7 +70,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/generated/source/r/debug/com/example/nativecodec/R.java" afterPath="$PROJECT_DIR$/app/build/generated/source/r/debug/com/example/nativecodec/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
@@ -68,7 +77,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/main.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/main.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
@@ -158,8 +166,8 @@
<file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+ <state relative-caret-position="-589">
+ <caret line="2" column="15" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="15" />
<folding />
</state>
</provider>
@@ -2692,7 +2700,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1176" extended-state="7" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -2747,13 +2755,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/android/opengl/GLES11Ext.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="155" column="30" selection-start-line="155" selection-start-column="30" selection-end-line="155" selection-end-column="30" />
- </state>
- </provider>
- </entry>
<entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/android/opengl/GLES20.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
@@ -2787,17 +2788,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest">
- <state />
- </provider>
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" />
- <folding />
</state>
</provider>
</entry>
@@ -3158,10 +3148,29 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider editor-type-id="android-manifest">
+ <state />
+ </provider>
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="190">
+ <caret line="10" column="80" selection-start-line="10" selection-start-column="71" selection-end-line="10" selection-end-column="80" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+ <state relative-caret-position="-589">
+ <caret line="2" column="15" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="15" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0