update android and test openh264+mp4v2

android/android/CMakeLists.txt

@@ -4,12 +4,21 @@
 
 cmake_minimum_required(VERSION 3.4.1)
 
+link_directories(
+	../../libs/curl-android-ios/android/${ANDROID_ABI}
+	../../libs/mp4v2/lib/android/${ANDROID_ABI}
+)
+
 # build native_app_glue as a static lib
 add_library(
 	app-glue STATIC
 	../../libs/native_app_glue/android_native_app_glue.c
 )
 
+add_library(openh264 SHARED IMPORTED)
+set_target_properties(openh264 PROPERTIES IMPORTED_LOCATION
+	${CMAKE_SOURCE_DIR}/../../libs/openh264/lib/android/${ANDROID_ABI}/libopenh264.so)
+
 # Specifies a library name, specifies whether the library is STATIC or
 # SHARED, and provides relative paths to the source code. You can
 # define multiple libraries by adding multiple add.library() commands,
@@ -59,7 +68,7 @@ add_library(
 	../../src/app_events.cpp
 	../../src/app_layout.cpp
 	../../src/app_shaders.cpp
-    ../../src/app_vr.cpp
+	../../src/app_vr.cpp
 	../../src/brush.cpp
 	../../src/canvas.cpp
 	../../src/canvas_layer.cpp
@@ -93,10 +102,10 @@ add_library(
 	../../src/node_panel_brush.cpp
 	../../src/node_panel_color.cpp
 	../../src/node_panel_grid.cpp
-    ../../src/node_panel_floating.cpp
+	../../src/node_panel_floating.cpp
 	../../src/node_panel_layer.cpp
 	../../src/node_panel_stroke.cpp
-    ../../src/node_panel_quick.cpp
+	../../src/node_panel_quick.cpp
 	../../src/node_popup_menu.cpp
 	../../src/node_progress_bar.cpp
 	../../src/node_settings.cpp
@@ -104,7 +113,7 @@ add_library(
 	../../src/node_stroke_preview.cpp
 	../../src/node_text.cpp
 	../../src/node_text_input.cpp
-    ../../src/node_tool_bucket.cpp
+	../../src/node_tool_bucket.cpp
 	../../src/node_usermanual.cpp
 	../../src/node_viewport.cpp
 	../../src/node_scroll.cpp
@@ -114,10 +123,11 @@ add_library(
 	../../src/settings.cpp
 	../../src/node_input_box.cpp
 	../../src/node_dialog_export_ppbr.cpp
+	../../src/node_panel_animation.cpp
 )
 
 target_include_directories(native-lib PRIVATE
-    src/main/cpp
+	src/main/cpp
 	../src/cpp
 	../../src
 	../../libs/glm
@@ -133,14 +143,18 @@ target_include_directories(native-lib PRIVATE
 	../../libs/native_app_glue
 	../../libs/hash-library
 	../../libs/fmt/include
+	../../libs/openh264/include
+	../../libs/mp4v2/include
 )
 
 # add lib dependencies
 target_link_libraries(
 	native-lib
+	libmp4v2.a
+	openh264
 	android
 	app-glue
-	${CMAKE_SOURCE_DIR}/../../libs/curl-android-ios/android/${ANDROID_ABI}/libcurl.a
+	libcurl.a
 	EGL
 	GLESv3
 	log

android/android/build.gradle

@@ -101,7 +101,7 @@ android {
           // Specifies the ABI configurations of your native
           // libraries Gradle should build and package with your APK.
           // abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
-          abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+          abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
     }
 
@@ -145,7 +145,7 @@ android {
         main {
             manifest.srcFile 'src/main/AndroidManifest.xml'
             java.srcDirs = ['../src/java', 'src/main/java']
-            //jniLibs.srcDir 'libs'
+            jniLibs.srcDirs = ['../../libs/openh264/lib/android']
             res.srcDirs = ['../src/res']
             //assets.srcDirs = ['../../assets']
         }