From 1abae81589a17aca13c3d200a295c98c828900eb Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Tue, 26 Jan 2021 21:24:31 +0000 Subject: [PATCH] rename android library folder name --- android.sh | 12 ++++++------ android/.gitignore | 2 +- android/build.gradle | 2 +- android/{app => ffmpeg-kit-android-lib}/Doxyfile | 0 android/{app => ffmpeg-kit-android-lib}/build.gradle | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/cpp/.gitignore | 0 .../src/main/cpp/android_lts_support.c | 0 .../src/main/cpp/ffmpegkit.c | 0 .../src/main/cpp/ffmpegkit.h | 0 .../src/main/cpp/ffmpegkit_abidetect.c | 0 .../src/main/cpp/ffmpegkit_abidetect.h | 0 .../src/main/cpp/ffmpegkit_exception.c | 0 .../src/main/cpp/ffmpegkit_exception.h | 0 .../src/main/cpp/ffprobekit.c | 0 .../src/main/cpp/ffprobekit.h | 0 .../src/main/cpp/fftools_cmdutils.c | 0 .../src/main/cpp/fftools_cmdutils.h | 0 .../src/main/cpp/fftools_ffmpeg.c | 0 .../src/main/cpp/fftools_ffmpeg.h | 0 .../src/main/cpp/fftools_ffmpeg_filter.c | 0 .../src/main/cpp/fftools_ffmpeg_hw.c | 0 .../src/main/cpp/fftools_ffmpeg_opt.c | 0 .../src/main/cpp/fftools_ffprobe.c | 0 .../src/main/cpp/saf_wrapper.c | 0 .../src/main/cpp/saf_wrapper.h | 0 .../src/main/java/com/arthenica/ffmpegkit/Abi.java | 0 .../main/java/com/arthenica/ffmpegkit/AbiDetect.java | 0 .../com/arthenica/ffmpegkit/AbstractSession.java | 0 .../arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java | 0 .../arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java | 0 .../ffmpegkit/AsyncGetMediaInformationTask.java | 0 .../java/com/arthenica/ffmpegkit/CameraSupport.java | 0 .../com/arthenica/ffmpegkit/ExecuteCallback.java | 0 .../main/java/com/arthenica/ffmpegkit/FFmpegKit.java | 0 .../com/arthenica/ffmpegkit/FFmpegKitConfig.java | 0 .../java/com/arthenica/ffmpegkit/FFmpegSession.java | 0 .../java/com/arthenica/ffmpegkit/FFprobeKit.java | 0 .../java/com/arthenica/ffmpegkit/FFprobeSession.java | 0 .../src/main/java/com/arthenica/ffmpegkit/Level.java | 0 .../src/main/java/com/arthenica/ffmpegkit/Log.java | 0 .../java/com/arthenica/ffmpegkit/LogCallback.java | 0 .../arthenica/ffmpegkit/LogRedirectionStrategy.java | 0 .../com/arthenica/ffmpegkit/MediaInformation.java | 0 .../arthenica/ffmpegkit/MediaInformationParser.java | 0 .../arthenica/ffmpegkit/MediaInformationSession.java | 0 .../main/java/com/arthenica/ffmpegkit/Packages.java | 0 .../java/com/arthenica/ffmpegkit/ReturnCode.java | 0 .../main/java/com/arthenica/ffmpegkit/Session.java | 0 .../java/com/arthenica/ffmpegkit/SessionState.java | 0 .../main/java/com/arthenica/ffmpegkit/Signal.java | 0 .../java/com/arthenica/ffmpegkit/Statistics.java | 0 .../com/arthenica/ffmpegkit/StatisticsCallback.java | 0 .../com/arthenica/ffmpegkit/StreamInformation.java | 0 .../com/arthenica/ffmpegkit/AbstractSessionTest.java | 0 .../com/arthenica/ffmpegkit/FFmpegKitConfigTest.java | 0 .../java/com/arthenica/ffmpegkit/FFmpegKitTest.java | 0 android/jni/Android.mk | 6 +++--- android/settings.gradle | 2 +- scripts/android/ffmpeg.sh | 2 +- scripts/android/kvazaar.sh | 2 +- scripts/function-android.sh | 10 +++++----- tools/clean.sh | 2 +- 64 files changed, 20 insertions(+), 20 deletions(-) rename android/{app => ffmpeg-kit-android-lib}/Doxyfile (100%) rename android/{app => ffmpeg-kit-android-lib}/build.gradle (100%) rename android/{app => ffmpeg-kit-android-lib}/proguard-rules.pro (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/AndroidManifest.xml (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/.gitignore (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/android_lts_support.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit_abidetect.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit_abidetect.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit_exception.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffmpegkit_exception.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffprobekit.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/ffprobekit.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_cmdutils.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_cmdutils.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffmpeg.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffmpeg.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffmpeg_filter.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffmpeg_hw.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffmpeg_opt.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/fftools_ffprobe.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/saf_wrapper.c (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/cpp/saf_wrapper.h (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Abi.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Level.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Log.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/LogCallback.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Packages.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Session.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/SessionState.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Signal.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/Statistics.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java (100%) rename android/{app => ffmpeg-kit-android-lib}/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java (100%) diff --git a/android.sh b/android.sh index 5d13738..679077b 100755 --- a/android.sh +++ b/android.sh @@ -34,14 +34,14 @@ BUILD_TYPE_ID="" BUILD_VERSION=$(git describe --tags --always 2>>"${BASEDIR}"/build.log) # PROCESS LTS BUILD OPTION FIRST AND SET BUILD TYPE: MAIN OR LTS -rm -f "${BASEDIR}"/android/app/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 -cp "${BASEDIR}"/tools/release/android/build.gradle "${BASEDIR}"/android/app/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 +rm -f "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 +cp "${BASEDIR}"/tools/release/android/build.gradle "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 for argument in "$@"; do if [[ "$argument" == "-l" ]] || [[ "$argument" == "--lts" ]]; then enable_lts_build BUILD_TYPE_ID+="LTS " - rm -f "${BASEDIR}"/android/app/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 - cp "${BASEDIR}"/tools/release/android/build.lts.gradle "${BASEDIR}"/android/app/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 + rm -f "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 + cp "${BASEDIR}"/tools/release/android/build.lts.gradle "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 fi done @@ -273,7 +273,7 @@ if [[ -n ${ANDROID_ARCHITECTURES} ]]; then echo -e -n "\n\nCreating Android archive under prebuilt: " # BUILD ANDROID ARCHIVE - ./gradlew app:clean app:assembleRelease app:testReleaseUnitTest 1>>"${BASEDIR}"/build.log 2>&1 + ./gradlew ffmpeg-kit-android-lib:clean ffmpeg-kit-android-lib:assembleRelease ffmpeg-kit-android-lib:testReleaseUnitTest 1>>"${BASEDIR}"/build.log 2>&1 if [ $? -ne 0 ]; then echo -e "failed\n" exit 1 @@ -283,7 +283,7 @@ if [[ -n ${ANDROID_ARCHITECTURES} ]]; then FFMPEG_KIT_AAR="${BASEDIR}/prebuilt/$(get_aar_directory)/ffmpeg-kit" rm -rf "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1 mkdir -p "${FFMPEG_KIT_AAR}" 1>>"${BASEDIR}"/build.log 2>&1 - cp "${BASEDIR}"/android/app/build/outputs/aar/ffmpeg-kit-release.aar "${FFMPEG_KIT_AAR}"/ffmpeg-kit.aar 1>>"${BASEDIR}"/build.log 2>&1 + cp "${BASEDIR}"/android/ffmpeg-kit-android-lib/build/outputs/aar/ffmpeg-kit-release.aar "${FFMPEG_KIT_AAR}"/ffmpeg-kit.aar 1>>"${BASEDIR}"/build.log 2>&1 if [ $? -ne 0 ]; then echo -e "failed\n" exit 1 diff --git a/android/.gitignore b/android/.gitignore index 447a113..b10a5b5 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -4,4 +4,4 @@ /.gradle/ /libs/ /obj/ -/app/build/ +/ffmpeg-kit-android-lib/build/ diff --git a/android/build.gradle b/android/build.gradle index c75707d..8183401 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' } } diff --git a/android/app/Doxyfile b/android/ffmpeg-kit-android-lib/Doxyfile similarity index 100% rename from android/app/Doxyfile rename to android/ffmpeg-kit-android-lib/Doxyfile diff --git a/android/app/build.gradle b/android/ffmpeg-kit-android-lib/build.gradle similarity index 100% rename from android/app/build.gradle rename to android/ffmpeg-kit-android-lib/build.gradle diff --git a/android/app/proguard-rules.pro b/android/ffmpeg-kit-android-lib/proguard-rules.pro similarity index 100% rename from android/app/proguard-rules.pro rename to android/ffmpeg-kit-android-lib/proguard-rules.pro diff --git a/android/app/src/main/AndroidManifest.xml b/android/ffmpeg-kit-android-lib/src/main/AndroidManifest.xml similarity index 100% rename from android/app/src/main/AndroidManifest.xml rename to android/ffmpeg-kit-android-lib/src/main/AndroidManifest.xml diff --git a/android/app/src/main/cpp/.gitignore b/android/ffmpeg-kit-android-lib/src/main/cpp/.gitignore similarity index 100% rename from android/app/src/main/cpp/.gitignore rename to android/ffmpeg-kit-android-lib/src/main/cpp/.gitignore diff --git a/android/app/src/main/cpp/android_lts_support.c b/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.c similarity index 100% rename from android/app/src/main/cpp/android_lts_support.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.c diff --git a/android/app/src/main/cpp/ffmpegkit.c b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.c similarity index 100% rename from android/app/src/main/cpp/ffmpegkit.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.c diff --git a/android/app/src/main/cpp/ffmpegkit.h b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.h similarity index 100% rename from android/app/src/main/cpp/ffmpegkit.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.h diff --git a/android/app/src/main/cpp/ffmpegkit_abidetect.c b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.c similarity index 100% rename from android/app/src/main/cpp/ffmpegkit_abidetect.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.c diff --git a/android/app/src/main/cpp/ffmpegkit_abidetect.h b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.h similarity index 100% rename from android/app/src/main/cpp/ffmpegkit_abidetect.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.h diff --git a/android/app/src/main/cpp/ffmpegkit_exception.c b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.c similarity index 100% rename from android/app/src/main/cpp/ffmpegkit_exception.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.c diff --git a/android/app/src/main/cpp/ffmpegkit_exception.h b/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.h similarity index 100% rename from android/app/src/main/cpp/ffmpegkit_exception.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.h diff --git a/android/app/src/main/cpp/ffprobekit.c b/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c similarity index 100% rename from android/app/src/main/cpp/ffprobekit.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c diff --git a/android/app/src/main/cpp/ffprobekit.h b/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.h similarity index 100% rename from android/app/src/main/cpp/ffprobekit.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.h diff --git a/android/app/src/main/cpp/fftools_cmdutils.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.c similarity index 100% rename from android/app/src/main/cpp/fftools_cmdutils.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.c diff --git a/android/app/src/main/cpp/fftools_cmdutils.h b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.h similarity index 100% rename from android/app/src/main/cpp/fftools_cmdutils.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.h diff --git a/android/app/src/main/cpp/fftools_ffmpeg.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.c similarity index 100% rename from android/app/src/main/cpp/fftools_ffmpeg.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.c diff --git a/android/app/src/main/cpp/fftools_ffmpeg.h b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.h similarity index 100% rename from android/app/src/main/cpp/fftools_ffmpeg.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.h diff --git a/android/app/src/main/cpp/fftools_ffmpeg_filter.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_filter.c similarity index 100% rename from android/app/src/main/cpp/fftools_ffmpeg_filter.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_filter.c diff --git a/android/app/src/main/cpp/fftools_ffmpeg_hw.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_hw.c similarity index 100% rename from android/app/src/main/cpp/fftools_ffmpeg_hw.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_hw.c diff --git a/android/app/src/main/cpp/fftools_ffmpeg_opt.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_opt.c similarity index 100% rename from android/app/src/main/cpp/fftools_ffmpeg_opt.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_opt.c diff --git a/android/app/src/main/cpp/fftools_ffprobe.c b/android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffprobe.c similarity index 100% rename from android/app/src/main/cpp/fftools_ffprobe.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffprobe.c diff --git a/android/app/src/main/cpp/saf_wrapper.c b/android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.c similarity index 100% rename from android/app/src/main/cpp/saf_wrapper.c rename to android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.c diff --git a/android/app/src/main/cpp/saf_wrapper.h b/android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.h similarity index 100% rename from android/app/src/main/cpp/saf_wrapper.h rename to android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.h diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Abi.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Abi.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Abi.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Abi.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Level.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Level.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Level.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Level.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Log.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Log.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Log.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Log.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/LogCallback.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogCallback.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/LogCallback.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogCallback.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Packages.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Packages.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Packages.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Packages.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Session.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Session.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Session.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Session.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/SessionState.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/SessionState.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/SessionState.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/SessionState.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Signal.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Signal.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Signal.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Signal.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/Statistics.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Statistics.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/Statistics.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Statistics.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java diff --git a/android/app/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java similarity index 100% rename from android/app/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java rename to android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java diff --git a/android/app/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java b/android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java similarity index 100% rename from android/app/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java rename to android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java diff --git a/android/app/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java b/android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java similarity index 100% rename from android/app/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java rename to android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java diff --git a/android/app/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java b/android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java similarity index 100% rename from android/app/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java rename to android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 2fae4ec..dadabf4 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -30,7 +30,7 @@ FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/includ MY_ARM_MODE := arm MY_ARM_NEON := false -LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp +LOCAL_PATH := $(MY_LOCAL_PATH)/../ffmpeg-kit-android-lib/src/main/cpp # DEFINE ARCH FLAGS ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) @@ -76,7 +76,7 @@ MY_BUILD_GENERIC_FFMPEG_KIT := true ifeq ($(MY_ARMV7_NEON), true) include $(CLEAR_VARS) - LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp + LOCAL_PATH := $(MY_LOCAL_PATH)/../ffmpeg-kit-android-lib/src/main/cpp LOCAL_ARM_MODE := $(MY_ARM_MODE) LOCAL_MODULE := ffmpegkit_armv7a_neon LOCAL_SRC_FILES := $(MY_SRC_FILES) @@ -98,7 +98,7 @@ endif ifeq ($(MY_BUILD_GENERIC_FFMPEG_KIT), true) include $(CLEAR_VARS) - LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp + LOCAL_PATH := $(MY_LOCAL_PATH)/../ffmpeg-kit-android-lib/src/main/cpp LOCAL_ARM_MODE := $(MY_ARM_MODE) LOCAL_MODULE := ffmpegkit LOCAL_SRC_FILES := $(MY_SRC_FILES) diff --git a/android/settings.gradle b/android/settings.gradle index 20491e2..70af3f7 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -include ':app' +include ':ffmpeg-kit-android-lib' include ':ffmpeg-kit' project(':ffmpeg-kit').projectDir = new File('..') rootProject.name = 'ffmpeg-kit-android' diff --git a/scripts/android/ffmpeg.sh b/scripts/android/ffmpeg.sh index a8dff1e..155534e 100755 --- a/scripts/android/ffmpeg.sh +++ b/scripts/android/ffmpeg.sh @@ -310,7 +310,7 @@ export LDFLAGS+=" -L${ANDROID_NDK_ROOT}/platforms/android-${API}/arch-${TOOLCHAI # LINKING WITH ANDROID LTS SUPPORT LIBRARY IS NECESSARY FOR API < 18 if [[ -n ${FFMPEG_KIT_LTS_BUILD} ]] && [[ ${API} -lt 18 ]]; then - export LDFLAGS+=" -Wl,--whole-archive ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a -Wl,--no-whole-archive" + export LDFLAGS+=" -Wl,--whole-archive ${BASEDIR}/android/ffmpeg-kit-android-lib/src/main/cpp/libandroidltssupport.a -Wl,--no-whole-archive" fi # ALWAYS BUILD SHARED LIBRARIES diff --git a/scripts/android/kvazaar.sh b/scripts/android/kvazaar.sh index 110f772..a8be508 100755 --- a/scripts/android/kvazaar.sh +++ b/scripts/android/kvazaar.sh @@ -11,7 +11,7 @@ fi # UPDATE BUILD FLAGS # LINKING WITH ANDROID LTS SUPPORT LIBRARY IS NECESSARY FOR API < 18 if [[ -n ${FFMPEG_KIT_LTS_BUILD} ]] && [[ ${API} -lt 18 ]]; then - LTS_SUPPORT_LIBS=" -Wl,--no-whole-archive ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a -Wl,--no-whole-archive" + LTS_SUPPORT_LIBS=" -Wl,--no-whole-archive ${BASEDIR}/android/ffmpeg-kit-android-lib/src/main/cpp/libandroidltssupport.a -Wl,--no-whole-archive" else LTS_SUPPORT_LIBS="" fi diff --git a/scripts/function-android.sh b/scripts/function-android.sh index 7a03533..9bc0a0f 100755 --- a/scripts/function-android.sh +++ b/scripts/function-android.sh @@ -15,7 +15,7 @@ enable_default_android_libraries() { } get_ffmpeg_kit_version() { - local FFMPEG_KIT_VERSION=$(grep '#define FFMPEG_KIT_VERSION' "${BASEDIR}"/android/app/src/main/cpp/ffmpegkit.h | grep -Eo '\".*\"' | sed -e 's/\"//g') + local FFMPEG_KIT_VERSION=$(grep '#define FFMPEG_KIT_VERSION' "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.h | grep -Eo '\".*\"' | sed -e 's/\"//g') echo "${FFMPEG_KIT_VERSION}" } @@ -968,8 +968,8 @@ set_toolchain_paths() { build_android_lts_support() { # CLEAN OLD BUILD - rm -f "${BASEDIR}"/android/app/src/main/cpp/android_lts_support.o 1>>"${BASEDIR}"/build.log 2>&1 - rm -f "${BASEDIR}"/android/app/src/main/cpp/android_lts_support.a 1>>"${BASEDIR}"/build.log 2>&1 + rm -f "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.o 1>>"${BASEDIR}"/build.log 2>&1 + rm -f "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.a 1>>"${BASEDIR}"/build.log 2>&1 echo -e "INFO: Building android-lts-support objects for ${ARCH}\n" 1>>"${BASEDIR}"/build.log 2>&1 @@ -983,6 +983,6 @@ build_android_lts_support() { LDFLAGS=$(get_ldflags ${LIB_NAME}) # BUILD - "$(get_clang_host)"-clang ${CFLAGS} -Wno-unused-command-line-argument -c "${BASEDIR}"/android/app/src/main/cpp/android_lts_support.c -o "${BASEDIR}"/android/app/src/main/cpp/android_lts_support.o ${LDFLAGS} 1>>"${BASEDIR}"/build.log 2>&1 - "${HOST}"-ar rcs "${BASEDIR}"/android/app/src/main/cpp/libandroidltssupport.a "${BASEDIR}"/android/app/src/main/cpp/android_lts_support.o 1>>"${BASEDIR}"/build.log 2>&1 + "$(get_clang_host)"-clang ${CFLAGS} -Wno-unused-command-line-argument -c "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.c -o "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.o ${LDFLAGS} 1>>"${BASEDIR}"/build.log 2>&1 + "${HOST}"-ar rcs "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/libandroidltssupport.a "${BASEDIR}"/android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.o 1>>"${BASEDIR}"/build.log 2>&1 } diff --git a/tools/clean.sh b/tools/clean.sh index 17495f9..e7ad510 100755 --- a/tools/clean.sh +++ b/tools/clean.sh @@ -5,7 +5,7 @@ rm -rf ../.tmp rm -f ../build.log rm -rf ../android/build -rm -rf ../android/app/build +rm -rf ../android/ffmpeg-kit-android-lib/build rm -rf ../android/obj rm -rf ../android/libs