Removing hard-float from compiling flags

ggfan · ggfan · commit 0ce6f8b33c57 · 2016-06-06T12:44:01.000-07:00
NDK-R12 will not support it anymore
diff --git a/common/nativeactivity/build.gradle b/common/nativeactivity/build.gradle
@@ -35,4 +35,4 @@ model {
             }
         }
     }
-}
+}
diff --git a/tutorial01_load_vulkan/app/build.gradle b/tutorial01_load_vulkan/app/build.gradle
@@ -23,15 +23,6 @@ model {
             abiFilters.addAll(["armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'])
 
         }
-        // Turn on hard float support in armeabi-v7a
-        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")
-            }
-        }
-
         sources {
             main {
                 jni {
diff --git a/tutorial01_load_vulkan/build.gradle b/tutorial01_load_vulkan/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'
+        classpath 'com.android.tools.build:gradle-experimental:0.7.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial02_prebuild_layers/app/build.gradle b/tutorial02_prebuild_layers/app/build.gradle
@@ -33,15 +33,6 @@ model {
             abiFilters.addAll(["armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'])
 
         }
-        // Turn on hard float support in armeabi-v7a
-        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")
-            }
-        }
-
         sources {
             main {
                 jni {
diff --git a/tutorial02_prebuild_layers/build.gradle b/tutorial02_prebuild_layers/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'
+        classpath 'com.android.tools.build:gradle-experimental:0.7.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial03_traceable_layers/app/build.gradle b/tutorial03_traceable_layers/app/build.gradle
@@ -31,15 +31,6 @@ model {
             abiFilters.addAll(["armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'])
 
         }
-        // Turn on hard float support in armeabi-v7a
-        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")
-            }
-        }
-
         sources {
             main {
                 jni {
diff --git a/tutorial03_traceable_layers/build.gradle b/tutorial03_traceable_layers/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'
+        classpath 'com.android.tools.build:gradle-experimental:0.7.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial04_first_window/app/build.gradle b/tutorial04_first_window/app/build.gradle
@@ -23,15 +23,6 @@ model {
             abiFilters.addAll(["armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'])
 
         }
-        // Turn on hard float support in armeabi-v7a
-        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")
-            }
-        }
-
         sources {
             main {
                 jni {
diff --git a/tutorial04_first_window/build.gradle b/tutorial04_first_window/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'
+        classpath 'com.android.tools.build:gradle-experimental:0.7.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial05_triangle/app/build.gradle b/tutorial05_triangle/app/build.gradle
@@ -29,14 +29,6 @@ model {
                              "-I" + file("../../common/vulkan_wrapper")])
             abiFilters.addAll(["armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'])
         }
-        // Turn on hard float support in armeabi-v7a
-        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")
-            }
-        }
         sources {
             main {
                 jni {
diff --git a/tutorial05_triangle/build.gradle b/tutorial05_triangle/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'
+        classpath 'com.android.tools.build:gradle-experimental:0.7.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ model {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle-experimental:0.7.0-rc1'`
	`8`	`+ classpath 'com.android.tools.build:gradle-experimental:0.7.0'`
`9`	`9`	`// NOTE: Do not place your application dependencies here; they belong`
`10`	`10`	`// in the individual module build.gradle files`
`11`	`11`	`}`