From 46df8e4451aa66c835728dbedfef516afacdb32b Mon Sep 17 00:00:00 2001
From: Xavier Hallade <xavier.hallade@intel.com>
Date: Thu, 17 Dec 2015 17:34:43 +0100
Subject: [PATCH] fixed static linkage declaration

and bumped gradle android plugin version to 0.6.0-alpha3
---
 hello-thirdparty/app/build.gradle | 10 +++-------
 hello-thirdparty/build.gradle     |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hello-thirdparty/app/build.gradle b/hello-thirdparty/app/build.gradle
index 8ccdb0f7..12220291 100644
--- a/hello-thirdparty/app/build.gradle
+++ b/hello-thirdparty/app/build.gradle
@@ -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"
                 }
             }
         }
diff --git a/hello-thirdparty/build.gradle b/hello-thirdparty/build.gradle
index a807548b..b34601df 100644
--- a/hello-thirdparty/build.gradle
+++ b/hello-thirdparty/build.gradle
@@ -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'
     }
 }