Switch Android build to clang.

It's now the recommended build from NDK 11+. GCC is deprecated.
hrydgard · May 21, 2016 · 83deca5 · 83deca5
1 parent 213b24b
commit 83deca5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
@@ -2,4 +2,4 @@ APP_STL := gnustl_static
 APP_PLATFORM := android-9
 APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
 APP_GNUSTL_CPP_FEATURES := 
-NDK_TOOLCHAIN_VERSION := 4.9
+NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
@@ -1,10 +1,10 @@
 # These are definitions for LOCAL_ variables for PPSSPP.
 # They are shared between ppsspp_jni (lib for Android app) and ppsspp_headless.
 
-LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -Wno-format
+LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -Wno-format
 # yes, it's really CPPFLAGS for C++
-# literal-suffix is generated by Android default code and causes noise.
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-literal-suffix -Wno-format
+# deprecated-register is generated by Android default code and causes noise.
+LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-format -Wno-deprecated-register
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../../Common \
   $(LOCAL_PATH)/../.. \