Skip to content

Commit

Permalink
Merge branch 'release/v0.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
hiteshsondhi88 committed Sep 19, 2014
2 parents 9cbc442 + a5cd862 commit 268593c
Show file tree
Hide file tree
Showing 29 changed files with 474 additions and 46 deletions.
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: android
android:
update_sdk: true
components:
- platform-tools
- tools
Expand All @@ -9,16 +10,12 @@ android:

# The SDK version used to compile your project
- android-16
- android-L

- sys-img-x86-android-16
before_install:
- echo no | android create avd -c 50M --force -n testx86 -t android-16 --abi x86
- emulator -avd testx86 -no-skin -no-audio -no-window -gpu on &

before_script:
# Make sure the emulator has started before running tests
- android-wait-for-emulator
- adb shell input keyevent 82 &
- sys-img-armeabi-v7a-android-16
- sys-img-armeabi-v7a-android-l
- sys-img-x86-android-l

script:
- ./gradlew --info build connectedAndroidTest
- ./runTests.sh || exit 1
Binary file modified FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg
Binary file not shown.
Binary file modified FFmpegAndroid/assets/armeabi-v7a/ffmpeg
Binary file not shown.
Binary file modified FFmpegAndroid/assets/x86/ffmpeg
Binary file not shown.
4 changes: 2 additions & 2 deletions FFmpegAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.github.hiteshsondhi88.libffmpeg"
minSdkVersion 16
targetSdkVersion 16
versionCode 22
versionName "0.2.2"
versionCode 23
versionName "0.2.3"
}

sourceSets.main {
Expand Down
2 changes: 1 addition & 1 deletion FFmpegAndroid/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Build for arm only
APP_ABI := armeabi armeabi-v7a
APP_ABI := armeabi armeabi-v7a x86

APP_PLATFORM := android-14
Binary file added FFmpegAndroid/libs/x86/libARM_ARCH.so
Binary file not shown.
Binary file added FFmpegAndroid/obj/local/x86/libARM_ARCH.so
Binary file not shown.
Binary file added FFmpegAndroid/obj/local/x86/libcpufeatures.a
Binary file not shown.
Binary file not shown.
79 changes: 79 additions & 0 deletions FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
obj/local/x86/objs/ARM_ARCH/armArch.o: jni/armArch.c \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h:

/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h:
Binary file not shown.
182 changes: 182 additions & 0 deletions FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
obj/local/x86/objs/cpufeatures/cpu-features.o: \
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.c \
/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \
/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h

/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h:

/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h:
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.github.hiteshsondhi88.libffmpeg;

import android.test.InstrumentationTestCase;

public class CommonInstrumentationTestCase extends InstrumentationTestCase {

@Override
protected void setUp() throws Exception {
super.setUp();
Log.setDEBUG(true);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ public void testGetCpuArch() throws Exception {
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.github.hiteshsondhi88.libffmpeg;

import android.content.res.AssetManager;
import android.text.TextUtils;

import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper;

import java.io.IOException;
import java.io.InputStream;

import static org.assertj.core.api.Assertions.assertThat;

public class CpuArchTest extends CommonInstrumentationTestCase {

public void testFFmpegAssetsWithSha1Sum() {
testFFmpegAsset(CpuArch.ARMv7, "armeabi-v7a/ffmpeg");
testFFmpegAsset(CpuArch.ARMv7_NEON, "armeabi-v7a-neon/ffmpeg");
testFFmpegAsset(CpuArch.x86, "x86/ffmpeg");
}

private void testFFmpegAsset(CpuArch cpuArch, String assetsPath) {
AssetManager assetMgr = getInstrumentation().getContext().getResources().getAssets();
InputStream is = null;
try {
is = assetMgr.open(assetsPath);
String assetSha1Sum = FileUtils.SHA1(is);
assertThat(!TextUtils.isEmpty(cpuArch.getSha1())
&& !TextUtils.isEmpty(assetSha1Sum)
&& cpuArch.getSha1().equals(assetSha1Sum)).isTrue();
} catch (IOException e) {
Log.e(e);
AssertionHelper.assertError("error validating ffmpeg asset "+assetsPath);
} finally {
Util.close(is);
}

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void run() {

public void testRunWaitFor() throws Exception {
ShellCommand shellCommand = new ShellCommand();
CommandResult commandResult = shellCommand.runWaitFor("ls /sdcard/");
CommandResult commandResult = shellCommand.runWaitFor("ls");
assertNotNull(commandResult);
assertEquals(true, commandResult.success);
assertThat(commandResult.output).isNotEmpty();
Expand Down
Loading

0 comments on commit 268593c

Please sign in to comment.