From ddb40e9e39e5044b37e839a06a07b26347eb8944 Mon Sep 17 00:00:00 2001 From: H1Gdev Date: Mon, 10 Sep 2018 10:46:59 +0900 Subject: [PATCH] playback/player/android: Update build.gradle Merge the following fixes from gst-docs https://bugzilla.gnome.org/show_bug.cgi?id=797070 https://bugzilla.gnome.org/show_bug.cgi?id=797093 https://bugzilla.gnome.org/show_bug.cgi?id=797107 --- playback/player/android/app/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/playback/player/android/app/build.gradle b/playback/player/android/app/build.gradle index c48b4073c7..b5fe0777b7 100644 --- a/playback/player/android/app/build.gradle +++ b/playback/player/android/app/build.gradle @@ -29,7 +29,7 @@ android { targets "gstplayer" // All archs except MIPS and MIPS64 are supported - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86' + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86' // x86_64 abis disabled because of https://bugzilla.gnome.org/show_bug.cgi?id=795454 } } @@ -50,12 +50,14 @@ android { } afterEvaluate { - compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug' - compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease' + if (project.hasProperty('compileDebugJavaWithJavac')) + project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug' + if (project.hasProperty('compileReleaseJavaWithJavac')) + project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease' } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.1.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:23.1.1' }