Fix gpg static lib usage in all samples

ggfan · ggfan · commit 7c19ff564ca8 · 2015-12-16T17:58:53.000-08:00
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"
                 }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ model {`
`17`	`17`	`libs(PrebuiltLibraries) {`
`18`	`18`	`gpg {`
`19`	`19`	`headers.srcDir "${gpg_cpp_path}/include"`
`20`		`- // StaticLibraryBinary does not work, use SharedLibraryBinary for now`
`21`		`- binaries.withType(SharedLibraryBinary) {`
`22`		`- sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")`
	`20`	`+ binaries.withType(StaticLibraryBinary) {`
	`21`	`+ staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")`
`23`	`22`	`}`
`24`	`23`	`}`
`25`	`24`	`}`
`@@ -38,7 +37,7 @@ model {`
`38`	`37`	`main {`
`39`	`38`	`jni {`
`40`	`39`	`dependencies {`
`41`		`- library "gpg"`
	`40`	`+ library "gpg" linkage "static"`
`42`	`41`	`project ":cpufeatures" linkage "static"`
`43`	`42`	`project ":native_app_glue" linkage "static"`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,8 @@ model {`
`16`	`16`	`libs(PrebuiltLibraries) {`
`17`	`17`	`gpg {`
`18`	`18`	`headers.srcDir "${gpg_cpp_path}/include"`
`19`		`- // StaticLibraryBinary does not work, use SharedLibraryBinary for now`
`20`		`- binaries.withType(SharedLibraryBinary) {`
`21`		`- sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")`
	`19`	`+ binaries.withType(StaticLibraryBinary) {`
	`20`	`+ staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`	`}`
`@@ -39,7 +38,7 @@ model {`
`39`	`38`	`main {`
`40`	`39`	`jni {`
`41`	`40`	`dependencies {`
`42`		`- library "gpg"`
	`41`	`+ library "gpg" linkage "static"`
`43`	`42`	`project ":cpufeatures" linkage "static"`
`44`	`43`	`project ":native_app_glue" linkage "static"`
`45`	`44`	`}`