add armv8 lib

houxiao

2017-05-11 6945c922494798b8f5f3843f8c675d15b1b2bfd1

add armv8 lib

git-svn-id: http://192.168.1.226/svn/proxy@619 454eff88-639b-444f-9e54-f578c98de674

 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>

 VisitFace/RtspNativeCodec/app/libs/libyuv/lib/arm64-v8a/libyuv_static.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libBasicUsageEnvironment.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libUsageEnvironment.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libgroupsock.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libliveMedia.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/opencv/lib/arm64-v8a/libopencv_java3.so

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf-lite.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf-lite.la

New file
@@ -0,0 +1,41 @@
# libprotobuf-lite.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4.6
#
# Please DO NOT delete this file!
# It is necessary for linking the library.

# The name that we can dlopen(3).
dlname='libprotobuf-lite.so'

# Names of this library.
library_names='libprotobuf-lite.so'

# The name of the static archive.
old_library='libprotobuf-lite.a'

# Linker flags that cannot go in dependency_libs.
inherited_linker_flags=''

# Libraries that this one depends upon.
dependency_libs=' -lgnustl_static -llog -lz'

# Names of additional weak libraries provided by this library
weak_library_names=''

# Version information for libprotobuf-lite.
current=12
age=0
revision=0

# Is this an already installed library?
installed=yes

# Should we warn about portability when linking against -modules?
shouldnotlink=no

# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''

# Directory that this library needs to be installed in:
libdir='/opt/protobuf.android/build/lib'

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf-lite.so

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf.la

New file
@@ -0,0 +1,41 @@
# libprotobuf.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4.6
#
# Please DO NOT delete this file!
# It is necessary for linking the library.

# The name that we can dlopen(3).
dlname='libprotobuf.so'

# Names of this library.
library_names='libprotobuf.so'

# The name of the static archive.
old_library='libprotobuf.a'

# Linker flags that cannot go in dependency_libs.
inherited_linker_flags=''

# Libraries that this one depends upon.
dependency_libs=' -lgnustl_static -llog -lz'

# Names of additional weak libraries provided by this library
weak_library_names=''

# Version information for libprotobuf.
current=12
age=0
revision=0

# Is this an already installed library?
installed=yes

# Should we warn about portability when linking against -modules?
shouldnotlink=no

# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''

# Directory that this library needs to be installed in:
libdir='/opt/protobuf.android/build/lib'

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf.so

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotoc.a

Binary files differ

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotoc.la

New file
@@ -0,0 +1,41 @@
# libprotoc.la - a libtool library file
# Generated by libtool (GNU libtool) 2.4.6
#
# Please DO NOT delete this file!
# It is necessary for linking the library.

# The name that we can dlopen(3).
dlname='libprotoc.so'

# Names of this library.
library_names='libprotoc.so'

# The name of the static archive.
old_library='libprotoc.a'

# Linker flags that cannot go in dependency_libs.
inherited_linker_flags=''

# Libraries that this one depends upon.
dependency_libs=' =/opt/protobuf.android/build/lib/libprotobuf.la -lgnustl_static -llog -lz'

# Names of additional weak libraries provided by this library
weak_library_names=''

# Version information for libprotoc.
current=12
age=0
revision=0

# Is this an already installed library?
installed=yes

# Should we warn about portability when linking against -modules?
shouldnotlink=no

# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''

# Directory that this library needs to be installed in:
libdir='/opt/protobuf.android/build/lib'

 VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotoc.so

Binary files differ

 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists_armv7.txt

New file
@@ -0,0 +1,80 @@
cmake_minimum_required(VERSION 3.4.1)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_OPENCV -DUSE_ST_SDK -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG")

#debug for video only test
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti  -Wall -UNDEBUG")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")

add_library(rtspface SHARED
            RtspNativeCodecJNI.cpp
            CameraWrapper.cpp
            FaceCache.cpp
            DebugNetwork.cpp

            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
            "D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
            "D:/workspace/proxy/RtspFace/MediaHelper.cpp"
            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp"
            "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
            "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp"
            "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"

            "D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
            "D:/workspace/proxy/FaceServer/PbFaceList.pb.cc"
            )

# Include libraries needed for native-codec-jni lib
target_link_libraries(rtspface
                      android
                      log
                      #ui
                      mediandk
                      #OpenMAXAL
                      #jnigraphics
                      #EGL
                      #GLESv2
                      #GLESv3
                      )

include_directories(
                    "D:/workspace/proxy/RtspFace"
                    "D:/workspace/proxy/FaceServer"

                    #"D:/workspace/libhardware-android-5.1.1_r38/include"
                    #"D:/workspace/core-android-5.1.1_r38/include"
                    #"D:/workspace/native-android-5.1.1_r38/include"
                    #"D:/workspace/core-android-5.1.1_r38/libsync/include"
                    #"D:/workspace/native-android-5.1.1_r38/opengl/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include"

                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
                    )

target_link_libraries(rtspface
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a"

                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so"
                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so"

                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so"
                      )