fixed static linkage declaration

and bumped gradle android plugin version to 0.6.0-alpha3
This commit is contained in:
Xavier Hallade
2015-12-17 17:34:43 +01:00
parent 7503eb82f0
commit 46df8e4451
2 changed files with 4 additions and 8 deletions

View File

@@ -8,12 +8,8 @@ model {
libs(PrebuiltLibraries) {
gpg {
headers.srcDir "${gpg_sdk_path}/include"
binaries.withType(SharedLibraryBinary) {
//
// NOTE: this block should be "StaticLibraryBinary"/staticLibraryFile - but SharedLibraryBinary works and StaticLibraryBinary doesn't as of 0.6.0-alpha2
// bug reported here: https://code.google.com/p/android/issues/detail?id=196065
//
sharedLibraryFile = file("${gpg_sdk_path}/lib/c++/${targetPlatform.getName()}/libgpg.a")
binaries.withType(StaticLibraryBinary) {
staticLibraryFile = file("${gpg_sdk_path}/lib/c++/${targetPlatform.getName()}/libgpg.a")
}
}
}
@@ -45,7 +41,7 @@ model {
main {
jni {
dependencies {
library "gpg"
library "gpg" linkage "static"
}
}
}

View File

@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha2'
classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha3'
}
}