diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-04-19 14:55:13 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-20 11:01:26 -0600 |
| commit | c025dba8e04c0ea8dd08a3d8e69f0a23c3924f33 (patch) | |
| tree | 0fd0d2fc95f934792c9f0ff1d527019c7e228737 /build-android | |
| parent | dc01811bfb74fe93818ac6c0f2ff3b219b6a1c22 (diff) | |
| download | usermoji-c025dba8e04c0ea8dd08a3d8e69f0a23c3924f33.tar.xz | |
gradle: Workaround for clang on Windows problems
Use gcc instead if building on Windows.
Diffstat (limited to 'build-android')
| -rw-r--r-- | build-android/gradle-templates/common.gradle | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/build-android/gradle-templates/common.gradle b/build-android/gradle-templates/common.gradle index f39578f6..f0219c6f 100644 --- a/build-android/gradle-templates/common.gradle +++ b/build-android/gradle-templates/common.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.model.native' +// To detect host operating system +import org.apache.tools.ant.taskdefs.condition.Os + Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) def ndkDir = properties.getProperty('ndk.dir') @@ -19,10 +22,19 @@ model { android.ndk { moduleName = "VkLayer_${project.name}" - toolchain = "clang" + + // This is a workaround for clang problems on Windows + // http://llvm.org/bugs/show_bug.cgi?id=27396 + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + toolchain = "gcc" + } else { + toolchain = "clang" + cppFlags.addAll(["-Werror"]) + } + stl = "gnustl_static" ldLibs.addAll(["log", "android"]) - cppFlags.addAll(["-std=c++11", "-DVK_PROTOTYPES", "-Wall", "-Werror", + cppFlags.addAll(["-std=c++11", "-DVK_PROTOTYPES", "-Wall", "-Wno-unused-function", "-Wno-unused-const-variable", "-DVK_USE_PLATFORM_ANDROID_KHR"]) cppFlags.addAll(["-I${file("../../../../layers")}".toString(), |