From 58556d1957c29447c80fc1ebd156681c5fb52ff5 Mon Sep 17 00:00:00 2001 From: alexcohn Date: Tue, 7 Apr 2020 14:53:10 +0300 Subject: [PATCH] Revert "use true names for executables" This reverts commit e50d1c4e See https://issuetracker.google.com/issues/152645643 for discussion: this is not supposed to work, wrap.sh is a special well-known name. Also, older devices (e.g. API 24) don't install files from libs directory if they don't match the expected "lib.*\.so" pattern. --- .../src/main/java/nl/bravobit/ffmpeg/FileUtils.java | 4 ++-- .../ffmpeg => jniLibs/armeabi-v7a/lib..ffmpeg..so} | Bin .../armeabi-v7a/lib..ffprobe..so} | Bin .../lib/x86/ffmpeg => jniLibs/x86/lib..ffmpeg..so} | Bin .../x86/ffprobe => jniLibs/x86/lib..ffprobe..so} | Bin 5 files changed, 2 insertions(+), 2 deletions(-) rename android-ffmpeg/src/main/{resources/lib/armeabi-v7a/ffmpeg => jniLibs/armeabi-v7a/lib..ffmpeg..so} (100%) rename android-ffmpeg/src/main/{resources/lib/armeabi-v7a/ffprobe => jniLibs/armeabi-v7a/lib..ffprobe..so} (100%) rename android-ffmpeg/src/main/{resources/lib/x86/ffmpeg => jniLibs/x86/lib..ffmpeg..so} (100%) rename android-ffmpeg/src/main/{resources/lib/x86/ffprobe => jniLibs/x86/lib..ffprobe..so} (100%) diff --git a/android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FileUtils.java b/android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FileUtils.java index 1512504..5a6e65e 100644 --- a/android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FileUtils.java +++ b/android-ffmpeg/src/main/java/nl/bravobit/ffmpeg/FileUtils.java @@ -5,8 +5,8 @@ import java.io.File; class FileUtils { - private static final String FFMPEG_FILE_NAME = "ffmpeg"; - private static final String FFPROBE_FILE_NAME = "ffprobe"; + private static final String FFMPEG_FILE_NAME = "lib..ffmpeg..so"; + private static final String FFPROBE_FILE_NAME = "lib..ffprobe.so"; static File getFFmpeg(Context context) { File folder = new File(context.getApplicationInfo().nativeLibraryDir); diff --git a/android-ffmpeg/src/main/resources/lib/armeabi-v7a/ffmpeg b/android-ffmpeg/src/main/jniLibs/armeabi-v7a/lib..ffmpeg..so similarity index 100% rename from android-ffmpeg/src/main/resources/lib/armeabi-v7a/ffmpeg rename to android-ffmpeg/src/main/jniLibs/armeabi-v7a/lib..ffmpeg..so diff --git a/android-ffmpeg/src/main/resources/lib/armeabi-v7a/ffprobe b/android-ffmpeg/src/main/jniLibs/armeabi-v7a/lib..ffprobe..so similarity index 100% rename from android-ffmpeg/src/main/resources/lib/armeabi-v7a/ffprobe rename to android-ffmpeg/src/main/jniLibs/armeabi-v7a/lib..ffprobe..so diff --git a/android-ffmpeg/src/main/resources/lib/x86/ffmpeg b/android-ffmpeg/src/main/jniLibs/x86/lib..ffmpeg..so similarity index 100% rename from android-ffmpeg/src/main/resources/lib/x86/ffmpeg rename to android-ffmpeg/src/main/jniLibs/x86/lib..ffmpeg..so diff --git a/android-ffmpeg/src/main/resources/lib/x86/ffprobe b/android-ffmpeg/src/main/jniLibs/x86/lib..ffprobe..so similarity index 100% rename from android-ffmpeg/src/main/resources/lib/x86/ffprobe rename to android-ffmpeg/src/main/jniLibs/x86/lib..ffprobe..so