diff options
author | guanghuafan <gfan@google.com> | 2016-03-31 07:49:00 -0700 |
---|---|---|
committer | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-03-31 20:09:47 -0600 |
commit | 5f1aee2bbdd8ca12bec0a4467ccf7341429b138e (patch) | |
tree | 8e234db2f606de411e62443aab058598a67c49e9 | |
parent | afe231ff44118feda82a49f27b16d4dea6eab124 (diff) | |
download | vulkan-validation-layers-5f1aee2bbdd8ca12bec0a4467ccf7341429b138e.tar.gz |
set hard float for arm7 correctly and minor cleanup
tested: Mac X
-rw-r--r-- | build-android/gradle-templates/common.gradle | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/build-android/gradle-templates/common.gradle b/build-android/gradle-templates/common.gradle index 9bb3e0d80..f39578f6f 100644 --- a/build-android/gradle-templates/common.gradle +++ b/build-android/gradle-templates/common.gradle @@ -32,6 +32,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 { @@ -53,15 +62,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']) @@ -69,4 +69,3 @@ model { } } -// buildDir = new File("../../build/layers"); |