Add library module

master
徐灿辉 5 years ago
parent 1416a54a3b
commit 66bfa44052
  1. 16
      app/build.gradle
  2. 2
      app/src/androidTest/java/com/github/xch168/ffmpeg/invoker/demo/ExampleInstrumentedTest.java
  3. 2
      app/src/main/AndroidManifest.xml
  4. 10
      app/src/main/cpp/native-lib.cpp
  5. 19
      app/src/main/java/com/github/xch168/ffmpeg/invoker/demo/MainActivity.java
  6. 2
      app/src/main/res/layout/activity_main.xml
  7. 17
      app/src/test/java/com/github/xch168/ffmpeg/invoker/demo/ExampleUnitTest.java
  8. 1
      library/.gitignore
  9. 50
      library/build.gradle
  10. 0
      library/consumer-rules.pro
  11. 21
      library/proguard-rules.pro
  12. 27
      library/src/androidTest/java/com/github/xch168/ffmpeg/invoker/ExampleInstrumentedTest.java
  13. 2
      library/src/main/AndroidManifest.xml
  14. 6
      library/src/main/cpp/CMakeLists.txt
  15. 9
      library/src/main/cpp/ffmpeg-invoker.cpp
  16. 24
      library/src/main/java/com/github/xch168/ffmpeg/invoker/FFmpegInvoker.java
  17. 0
      library/src/test/java/com/github/xch168/ffmpeg/invoker/ExampleUnitTest.java
  18. 1
      settings.gradle

@ -12,12 +12,6 @@ android {
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
cppFlags ""
}
}
}
buildTypes {
@ -26,13 +20,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
}
}
}
dependencies {
@ -43,4 +30,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation project(path: ':library')
}

@ -1,4 +1,4 @@
package com.github.xch168.ffmpeg.invoker;
package com.github.xch168.ffmpeg.invoker.demo;
import android.content.Context;

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.xch168.ffmpeg.invoker">
package="com.github.xch168.ffmpeg.invoker.demo">
<application
android:allowBackup="true"

@ -1,10 +0,0 @@
#include <jni.h>
#include <string>
extern "C" JNIEXPORT jstring JNICALL
Java_com_github_xch168_ffmpeg_invoker_MainActivity_stringFromJNI(
JNIEnv* env,
jobject /* this */) {
std::string hello = "Hello from C++";
return env->NewStringUTF(hello.c_str());
}

@ -1,16 +1,14 @@
package com.github.xch168.ffmpeg.invoker;
import androidx.appcompat.app.AppCompatActivity;
package com.github.xch168.ffmpeg.invoker.demo;
import android.os.Bundle;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import com.github.xch168.ffmpeg.invoker.FFmpegInvoker;
public class MainActivity extends AppCompatActivity {
// Used to load the 'native-lib' library on application startup.
static {
System.loadLibrary("native-lib");
}
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -19,12 +17,7 @@ public class MainActivity extends AppCompatActivity {
// Example of a call to a native method
TextView tv = findViewById(R.id.sample_text);
tv.setText(stringFromJNI());
tv.setText(FFmpegInvoker.stringFromJNI());
}
/**
* A native method that is implemented by the 'native-lib' native library,
* which is packaged with this application.
*/
public native String stringFromJNI();
}

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context="com.github.xch168.ffmpeg.invoker.demo.MainActivity">
<TextView
android:id="@+id/sample_text"

@ -0,0 +1,17 @@
package com.github.xch168.ffmpeg.invoker.demo;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}

@ -0,0 +1 @@
/build

@ -0,0 +1,50 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 29
buildToolsVersion "29.0.3"
defaultConfig {
minSdkVersion 16
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
externalNativeBuild {
cmake {
cppFlags ""
abiFilters "armeabi-v7a", "arm64-v8a", "x86"
}
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
}
}
sourceSets.main {
jniLibs.srcDir 'libs'
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

@ -0,0 +1,27 @@
package com.github.xch168.ffmpeg.invoker;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.github.xch168.ffmpeg.invoker.test", appContext.getPackageName());
}
}

@ -0,0 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.xch168.ffmpeg.invoker" />

@ -11,13 +11,13 @@ cmake_minimum_required(VERSION 3.4.1)
# Gradle automatically packages shared libraries with your APK.
add_library( # Sets the name of the library.
native-lib
ffmpeg-invoker
# Sets the library as a shared library.
SHARED
# Provides a relative path to your source file(s).
native-lib.cpp )
ffmpeg-invoker.cpp)
# Searches for a specified prebuilt library and stores the path as a
# variable. Because CMake includes system libraries in the search path by
@ -37,7 +37,7 @@ find_library( # Sets the name of the path variable.
# build script, prebuilt third-party libraries, or system libraries.
target_link_libraries( # Specifies the target library.
native-lib
ffmpeg-invoker
# Links the target library to the log library
# included in the NDK.

@ -0,0 +1,9 @@
#include <jni.h>
#include <string>
extern "C"
JNIEXPORT jstring JNICALL
Java_com_github_xch168_ffmpeg_invoker_FFmpegInvoker_stringFromJNI(JNIEnv *env, jclass clazz) {
std::string hello = "Hello from C++";
return env->NewStringUTF(hello.c_str());
}

@ -0,0 +1,24 @@
package com.github.xch168.ffmpeg.invoker;
/**
* Created by XuCanHui on 2020/3/14.
*/
public class FFmpegInvoker {
static {
System.loadLibrary("ffmpeg-invoker");
}
public static native String stringFromJNI();
public static void exec(Callback callback)
{
}
public interface Callback {
void onSuccess();
void onFailure();
void onProgress();
}
}

@ -1,2 +1,3 @@
rootProject.name='FFmpeg-Invoker'
include ':app'
include ':library'

Loading…
Cancel
Save