Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ARM64 crash. #75

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*~
.gradle
build
decoder/build
decoder/src/main/libs
decoder/src/main/obj
player/build
18 changes: 18 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
buildscript {
repositories {
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.1.1'
}
}

allprojects {
repositories {
jcenter()
mavenLocal()
}
}

47 changes: 0 additions & 47 deletions build.xml

This file was deleted.

11 changes: 0 additions & 11 deletions decoder/AndroidManifest.xml

This file was deleted.

45 changes: 45 additions & 0 deletions decoder/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import org.apache.tools.ant.taskdefs.condition.Os

apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
compileSdkVersion 23
buildToolsVersion '23.0.1'

defaultConfig {
minSdkVersion 15
targetSdkVersion 23
versionCode 10
versionName "0.8"
group = 'com.spoledge.aacdecoder'
version = '0.8-SNAPSHOT'
ndk { stl "gnustl_static" }
}

sourceSets.main {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = []
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

task ndkBuild(type: Exec) {
def ndkDir = project.plugins.findPlugin('com.android.library').getNdkFolder()

if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine "$ndkDir/ndk-build.cmd", '-C', file('src/main/jni').absolutePath
} else {
commandLine "$ndkDir/ndk-build", '-C', file('src/main/jni').absolutePath
}
}

tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn ndkBuild
}
}
107 changes: 0 additions & 107 deletions decoder/build.xml

This file was deleted.

115 changes: 0 additions & 115 deletions decoder/pom.xml

This file was deleted.

6 changes: 6 additions & 0 deletions decoder/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.spoledge.aacdecoder"
android:versionCode="10"
android:versionName="0.8">
</manifest>
Loading