mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-05 22:12:34 +00:00
Android tutorials: Run 'android-tutorial-1' error on Android Studio
If Run 'android-tutorial-1' on Android Studio then property 'compileReleaseJavaWithJavac' does not exist. So add property 'compileReleaseJavaWithJavac' check. Fix android-tutorial-1 - android-tutorial-5. https://bugzilla.gnome.org/show_bug.cgi?id=797070 and Replace indent from tab to space.
This commit is contained in:
parent
5734224b1e
commit
20d9fe541c
5 changed files with 30 additions and 20 deletions
|
@ -39,10 +39,10 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aidl.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
|
@ -61,8 +61,10 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
if (project.hasProperty('compileDebugJavaWithJavac'))
|
||||||
compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
||||||
|
if (project.hasProperty('compileReleaseJavaWithJavac'))
|
||||||
|
project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -39,10 +39,10 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aidl.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
|
@ -61,8 +61,10 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
if (project.hasProperty('compileDebugJavaWithJavac'))
|
||||||
compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
||||||
|
if (project.hasProperty('compileReleaseJavaWithJavac'))
|
||||||
|
project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -39,10 +39,10 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aidl.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
|
@ -61,8 +61,10 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
if (project.hasProperty('compileDebugJavaWithJavac'))
|
||||||
compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
||||||
|
if (project.hasProperty('compileReleaseJavaWithJavac'))
|
||||||
|
project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -39,10 +39,10 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aidl.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
|
@ -61,8 +61,10 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
if (project.hasProperty('compileDebugJavaWithJavac'))
|
||||||
compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
||||||
|
if (project.hasProperty('compileReleaseJavaWithJavac'))
|
||||||
|
project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -39,10 +39,10 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aidl.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
|
@ -61,8 +61,10 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
if (project.hasProperty('compileDebugJavaWithJavac'))
|
||||||
compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
project.compileDebugJavaWithJavac.dependsOn 'externalNativeBuildDebug'
|
||||||
|
if (project.hasProperty('compileReleaseJavaWithJavac'))
|
||||||
|
project.compileReleaseJavaWithJavac.dependsOn 'externalNativeBuildRelease'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
Loading…
Reference in a new issue