Fix gpg static lib usage in all samples

playgameservices · Dec 17, 2015 · 7c19ff5 · 7c19ff5
1 parent 155b787
commit 7c19ff5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/samples-android/ButtonClicker/build.gradle b/samples-android/ButtonClicker/build.gradle
@@ -17,9 +17,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -38,7 +37,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }

diff --git a/samples-android/CollectAllTheStarsNative/build.gradle b/samples-android/CollectAllTheStarsNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -39,7 +38,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }

diff --git a/samples-android/Minimalist/build.gradle b/samples-android/Minimalist/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -40,7 +39,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
                 source {

diff --git a/samples-android/TbmpSkeletonNative/build.gradle b/samples-android/TbmpSkeletonNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -42,7 +41,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg"  linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }

diff --git a/samples-android/Teapot/build.gradle b/samples-android/Teapot/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -38,7 +37,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }

diff --git a/samples-android/TrivialQuestNative/build.gradle b/samples-android/TrivialQuestNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -39,7 +38,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }