diff options
| author | guanghuafan <gfan@google.com> | 2016-03-31 13:02:11 -0700 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-07 15:00:38 -0600 |
| commit | baaf3d78988ef4aca8216ad2fee3d3a26bb63723 (patch) | |
| tree | 961d967a64ad1dbb3316d7b9ecac7c1aededa766 | |
| parent | c27e9bba6ac07795da6914765b11f21e1864c36c (diff) | |
| download | usermoji-baaf3d78988ef4aca8216ad2fee3d3a26bb63723.tar.xz | |
android: Minor clean up for windows build template
| -rw-r--r-- | build-android/gradle-templates/win.template.gradle | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build-android/gradle-templates/win.template.gradle b/build-android/gradle-templates/win.template.gradle index 036b3213..6efae6fa 100644 --- a/build-android/gradle-templates/win.template.gradle +++ b/build-android/gradle-templates/win.template.gradle @@ -38,6 +38,15 @@ model { "-I${file("../../../../../glslang")}".toString()])
}
+ // Turn on hard float support in armeabi-v7a
+ android.abis {
+ create("armeabi-v7a") {
+ cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", "-mfloat-abi=hard"])
+ ldLibs.add("m_hard")
+ ldFlags.add("-Wl,--no-warn-mismatch")
+ }
+ }
+
android.sources {
main {
jni {
@@ -59,15 +68,6 @@ model { }
}
android.productFlavors {
- create ("x86") {
- ndk.abiFilters.add("x86")
- }
- create ("arm7") {
- ndk.abiFilters.add("armeabi-v7a")
- ndk.cppFlags.addAll(["-mhard-float", "-D_NDK_MATH_NO_SOFTFP=1", "-mfloat-abi=hard"])
- ndk.ldLibs.add("m_hard")
- ndk.ldFlags.add("-Wl,--no-warn-mismatch")
- }
create ("all") {
ndk.abiFilters.addAll(["armeabi-v7a", 'arm64-v8a',
'x86', 'x86_64'])
|