diff options
author | Don Turner <don@chonk.co.uk> | 2015-10-05 21:09:37 +0100 |
---|---|---|
committer | Don Turner <don@chonk.co.uk> | 2015-10-05 21:09:37 +0100 |
commit | f2168be23479c8c86fccec368669381f1fdf56c3 (patch) | |
tree | fbb84b87e4e5088396208d31a8a220ba34dbc494 /LoopbackApp/app | |
parent | 2385d9ebbf36c71353a5fdb6515562f49ef1d426 (diff) | |
download | drrickorang-f2168be23479c8c86fccec368669381f1fdf56c3.tar.gz |
Updating project to use latest experimental gradle plugin for NDK support (0.3.0-alpha6)
Diffstat (limited to 'LoopbackApp/app')
-rw-r--r-- | LoopbackApp/app/app.iml | 10 | ||||
-rw-r--r-- | LoopbackApp/app/build.gradle | 42 | ||||
-rw-r--r-- | LoopbackApp/app/src/main/AndroidManifest.xml | 4 |
3 files changed, 30 insertions, 26 deletions
diff --git a/LoopbackApp/app/app.iml b/LoopbackApp/app/app.iml index bf41d69..136db05 100644 --- a/LoopbackApp/app/app.iml +++ b/LoopbackApp/app/app.iml @@ -36,34 +36,34 @@ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/debug/renderscript" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/renderscript" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/renderscript" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> diff --git a/LoopbackApp/app/build.gradle b/LoopbackApp/app/build.gradle index b1172f4..468d772 100644 --- a/LoopbackApp/app/build.gradle +++ b/LoopbackApp/app/build.gradle @@ -1,26 +1,34 @@ -apply plugin: 'com.android.application' +apply plugin: 'com.android.model.application' -android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" +model { + android { + compileSdkVersion = 21 + buildToolsVersion = "21.1.1" - defaultConfig { - applicationId "org.drrickorang.loopback" - minSdkVersion 11 - targetSdkVersion 21 - - ndk { - moduleName "libloopback" - ldLibs "OpenSLES", "log" + defaultConfig.with { + applicationId = "org.drrickorang.loopback" + minSdkVersion.apiLevel = 11 + targetSdkVersion.apiLevel = 21 } } + android.ndk { + moduleName += "loopback" + cppFlags += "-I${project.rootDir}/app/src/main/jni".toString() + CFlags += "-I${project.rootDir}/app/src/main/jni".toString() + + ldLibs += "OpenSLES" + ldLibs += "log" + } - buildTypes { + android.buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + minifyEnabled = false + proguardFiles += file('proguard.cfg') + } + debug { + ndk.with { + debuggable = true + } } } - - } diff --git a/LoopbackApp/app/src/main/AndroidManifest.xml b/LoopbackApp/app/src/main/AndroidManifest.xml index 4dae4a7..1122313 100644 --- a/LoopbackApp/app/src/main/AndroidManifest.xml +++ b/LoopbackApp/app/src/main/AndroidManifest.xml @@ -26,10 +26,6 @@ android:versionCode="7" android:versionName="0.5"> - <uses-sdk - android:minSdkVersion="18" - android:targetSdkVersion="21"/> - <uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> |