diff --git a/.gitignore b/.gitignore
index f58ff0b9..ada82881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,5 @@ Thumbs.db
build/
# Compiled JNI libraries folder
-**/jniLibs
\ No newline at end of file
+**/jniLibs
+app/.externalNativeBuild/
diff --git a/app/app.iml b/app/app.iml
index b064e103..61f2bcc1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,7 @@
-
-
- generateNonRootDebugAndroidTestSources
generateNonRootDebugSources
@@ -25,16 +22,26 @@
+
+
+
+
+
-
+
+
+
+
+
+
@@ -42,71 +49,91 @@
-
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
+
-
-
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 4cb47e49..fcdb146a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ buildToolsVersion "24.0.2"
defaultConfig {
minSdkVersion 16
@@ -18,10 +18,16 @@ android {
productFlavors {
root {
applicationId "com.limelight.root"
+ ndk {
+ abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+ }
}
nonRoot {
applicationId "com.limelight"
+ ndk {
+ abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+ }
}
}
@@ -43,32 +49,10 @@ android {
exclude 'META-INF/BCKEY.DSA'
}
- sourceSets.main.jni.srcDirs = []
-
- //noinspection GroovyAssignabilityCheck,GroovyAssignabilityCheck
- task ndkBuild(type: Exec, description: 'Compile JNI source via NDK') {
- Properties properties = new Properties()
- properties.load(project.rootProject.file('local.properties').newDataInputStream())
- def ndkDir = properties.getProperty('ndk.dir')
-
- if (Os.isFamily(Os.FAMILY_WINDOWS)) {
- commandLine "$ndkDir\\ndk-build.cmd",
- 'NDK_PROJECT_PATH=build/intermediates/ndk',
- 'NDK_LIBS_OUT=src/main/jniLibs',
- 'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
- 'NDK_APPLICATION_MK=src/main/jni/Application.mk'
+ externalNativeBuild {
+ ndkBuild {
+ path "src/main/jni/Android.mk"
}
- else {
- commandLine "$ndkDir/ndk-build",
- 'NDK_PROJECT_PATH=build/intermediates/ndk',
- 'NDK_LIBS_OUT=src/main/jniLibs',
- 'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
- 'NDK_APPLICATION_MK=src/main/jni/Application.mk'
- }
- }
-
- tasks.withType(JavaCompile) {
- compileTask -> compileTask.dependsOn ndkBuild
}
}
diff --git a/build.gradle b/build.gradle
index bbe9eb20..305dc055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.3'
+ classpath 'com.android.tools.build:gradle:2.2.0'
}
}
diff --git a/moonlight-android.iml b/moonlight-android.iml
index c55e7a52..90d1cce9 100644
--- a/moonlight-android.iml
+++ b/moonlight-android.iml
@@ -13,7 +13,7 @@
-
+
\ No newline at end of file