From f6a85f67515edddce5ab5949e3de1687c7b88127 Mon Sep 17 00:00:00 2001 From: "Samuel C. Yang" Date: Tue, 24 Nov 2015 18:59:58 -0800 Subject: [PATCH] - Commented out 64-bit builds. - Modified to conform better to --- build.gradle | 2 +- demo/build.gradle | 8 +- demo/src/main/AndroidManifest.xml | 4 +- .../rtspextractor/demo/MainActivity.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 73 +++++++++++-------- 6 files changed, 50 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index 3dce22d..a4d7068 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle-experimental:0.2.1' + classpath 'com.android.tools.build:gradle-experimental:0.3.0-alpha7' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/demo/build.gradle b/demo/build.gradle index 47f7977..24b3154 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -12,11 +12,11 @@ model { versionCode = 1 versionName = "1.0" } - } - compileOptions.with { - sourceCompatibility=JavaVersion.VERSION_1_7 - targetCompatibility=JavaVersion.VERSION_1_7 + compileOptions.with { + sourceCompatibility=JavaVersion.VERSION_1_7 + targetCompatibility=JavaVersion.VERSION_1_7 + } } android.buildTypes { diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 4daa1af..f59dc63 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="me.courbiere.rtspextractor.demo" > diff --git a/demo/src/main/java/me/courbiere/rtspextractor/demo/MainActivity.java b/demo/src/main/java/me/courbiere/rtspextractor/demo/MainActivity.java index 11fe825..79908f0 100644 --- a/demo/src/main/java/me/courbiere/rtspextractor/demo/MainActivity.java +++ b/demo/src/main/java/me/courbiere/rtspextractor/demo/MainActivity.java @@ -7,7 +7,7 @@ import android.support.v7.widget.Toolbar; import android.view.View; -import me.courbiere.rtspextractor.R; +import me.courbiere.rtspextractor.demo.R; public class MainActivity extends AppCompatActivity { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a25a3b..ff79c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index fd78827..28282ea 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,20 +3,19 @@ apply plugin: 'com.android.model.library' model { android { compileSdkVersion = 23 - buildToolsVersion = "23.0.1" + buildToolsVersion = "23.0.2" defaultConfig.with { - applicationId = "me.courbiere.rtspextractor" minSdkVersion.apiLevel = 16 targetSdkVersion.apiLevel = 23 versionCode = 1 versionName = "1.0" } - } - compileOptions.with { - sourceCompatibility=JavaVersion.VERSION_1_7 - targetCompatibility=JavaVersion.VERSION_1_7 + compileOptions.with { + sourceCompatibility=JavaVersion.VERSION_1_7 + targetCompatibility=JavaVersion.VERSION_1_7 + } } /* @@ -26,20 +25,20 @@ model { moduleName = "rtspextractor" toolchain = "clang" toolchainVersion = "3.5" -// cppFlags += "-march=armv7-a" - cppFlags += "-mfloat-abi=softfp" - cppFlags += "-mfpu=neon" - cppFlags += "-g" - cppFlags += "-O0" - cppFlags += "-I${file("src/main/jni/include")}".toString() - ldFlags += "-L${file("src/main/jniLibs/")}".toString() - ldLibs += ["log", "z", "m", "avformat-56", "avcodec-56", "swscale-3", "avutil-54", "ssl", "rtmp-1"] +// cppFlags.add("-march=armv7-a") + cppFlags.add("-mfloat-abi=softfp") + cppFlags.add("-mfpu=neon") + cppFlags.add("-g") + cppFlags.add("-O0") + cppFlags.add("-I${file("src/main/jni/include")}".toString()) + ldFlags.add("-L${file("src/main/jniLibs/")}".toString()) + ldLibs.addAll(["log", "z", "m", "avformat-56", "avcodec-56", "swscale-3", "avutil-54", "ssl", "rtmp-1"]) } android.buildTypes { release { minifyEnabled = false - proguardFiles += file('proguard-rules.pro') + proguardFiles.add(file('proguard-rules.pro')) } } @@ -47,28 +46,38 @@ model { // for detailed abiFilter descriptions, refer to "Supported ABIs" @ // https://developer.android.com/ndk/guides/abis.html#sa create("arm") { - ndk.abiFilters += "armeabi" - } - create("arm7") { - ndk.abiFilters += "armeabi-v7a" - } - create("arm8") { - ndk.abiFilters += "arm64-v8a" + ndk.with { + abiFilters.add("armeabi") + abiFilters.add("armeabi-v7a") + } } +// create("arm8") { +// ndk.with { +// abiFilters.add("arm64-v8a") +// } +// } create("x86") { - ndk.abiFilters += "x86" - } - create("x86-64") { - ndk.abiFilters += "x86_64" + ndk.with { + abiFilters.add("x86") + } } +// create("x86-64") { +// ndk.with { +// abiFilters.add("x86_64") +// } +// } create("mips") { - ndk.abiFilters += "mips" - } - create("mips-64") { - ndk.abiFilters += "mips64" + ndk.with { + abiFilters.add("mips") + } } +// create("mips-64") { +// ndk.with { +// abiFilters.add("mips64") +// } +// } // To include all cpu architectures, leaves abiFilters empty - create("all") +// create("all") } } @@ -76,4 +85,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.1.0' compile 'com.google.android.exoplayer:exoplayer:r1.2.3' -} +} \ No newline at end of file