rename android library folder name

pull/7/head
Taner Sener 5 years ago
parent 8596b8c6bf
commit 1abae81589
  1. 12
      android.sh
  2. 2
      android/.gitignore
  3. 2
      android/build.gradle
  4. 0
      android/ffmpeg-kit-android-lib/Doxyfile
  5. 0
      android/ffmpeg-kit-android-lib/build.gradle
  6. 0
      android/ffmpeg-kit-android-lib/proguard-rules.pro
  7. 0
      android/ffmpeg-kit-android-lib/src/main/AndroidManifest.xml
  8. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/.gitignore
  9. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/android_lts_support.c
  10. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.c
  11. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.h
  12. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.c
  13. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_abidetect.h
  14. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.c
  15. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit_exception.h
  16. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c
  17. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.h
  18. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.c
  19. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_cmdutils.h
  20. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.c
  21. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg.h
  22. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_filter.c
  23. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_hw.c
  24. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffmpeg_opt.c
  25. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/fftools_ffprobe.c
  26. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.c
  27. 0
      android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.h
  28. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Abi.java
  29. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbiDetect.java
  30. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AbstractSession.java
  31. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFmpegExecuteTask.java
  32. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncFFprobeExecuteTask.java
  33. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/AsyncGetMediaInformationTask.java
  34. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/CameraSupport.java
  35. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ExecuteCallback.java
  36. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKit.java
  37. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java
  38. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegSession.java
  39. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeKit.java
  40. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFprobeSession.java
  41. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Level.java
  42. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Log.java
  43. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogCallback.java
  44. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/LogRedirectionStrategy.java
  45. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformation.java
  46. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationParser.java
  47. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/MediaInformationSession.java
  48. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Packages.java
  49. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/ReturnCode.java
  50. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Session.java
  51. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/SessionState.java
  52. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Signal.java
  53. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/Statistics.java
  54. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StatisticsCallback.java
  55. 0
      android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/StreamInformation.java
  56. 0
      android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/AbstractSessionTest.java
  57. 0
      android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitConfigTest.java
  58. 0
      android/ffmpeg-kit-android-lib/src/test/java/com/arthenica/ffmpegkit/FFmpegKitTest.java
  59. 6
      android/jni/Android.mk
  60. 2
      android/settings.gradle
  61. 2
      scripts/android/ffmpeg.sh
  62. 2
      scripts/android/kvazaar.sh
  63. 10
      scripts/function-android.sh
  64. 2
      tools/clean.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

@ -4,4 +4,4 @@
/.gradle/
/libs/
/obj/
/app/build/
/ffmpeg-kit-android-lib/build/

@ -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'
}
}

@ -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)

@ -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'

@ -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

@ -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

@ -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
}

@ -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

Loading…
Cancel
Save