diff --git a/.travis.yml b/.travis.yml
index 966f293146..1e67e468bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,3 +26,9 @@ script:
 - tools/travis-scripts/run-script.sh
 before_install:
 - tools/travis-scripts/before-install.sh
+
+# whitelist
+branches:
+  only:
+    - master
+    - develop
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
index 5273ceb9dd..74af9626ab 100644
--- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
+++ b/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
@@ -1,6 +1,5 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk b/samples/Cpp/HelloCpp/proj.android/jni/Application.mk
index 0e9d025fba..74af9626ab 100644
--- a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk
+++ b/samples/Cpp/HelloCpp/proj.android/jni/Application.mk
@@ -2,4 +2,4 @@ APP_STL := gnustl_static
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
index 0e9d025fba..74af9626ab 100644
--- a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
+++ b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
@@ -2,4 +2,4 @@ APP_STL := gnustl_static
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/TestCpp/proj.android/jni/Application.mk b/samples/Cpp/TestCpp/proj.android/jni/Application.mk
index 9761d1692d..47d8add103 100644
--- a/samples/Cpp/TestCpp/proj.android/jni/Application.mk
+++ b/samples/Cpp/TestCpp/proj.android/jni/Application.mk
@@ -2,4 +2,4 @@ APP_STL := gnustl_static
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
index 24a7a8cbb3..3666985a1f 100644
--- a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
+++ b/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
@@ -1,7 +1,6 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
 
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
index 24a7a8cbb3..3666985a1f 100644
--- a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
+++ b/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
@@ -1,7 +1,6 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
 
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk
index 6608c6e10e..47d8add103 100644
--- a/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk
+++ b/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk
@@ -1,6 +1,5 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT= -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk b/samples/Javascript/TestJavascript/proj.android/jni/Application.mk
index dc8b56b0ac..47d8add103 100644
--- a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk
+++ b/samples/Javascript/TestJavascript/proj.android/jni/Application.mk
@@ -1,6 +1,5 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
index dc8b56b0ac..47d8add103 100644
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
+++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
@@ -1,6 +1,5 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Lua/HelloLua/proj.android/jni/Application.mk b/samples/Lua/HelloLua/proj.android/jni/Application.mk
index a829fc0f48..540e49c358 100644
--- a/samples/Lua/HelloLua/proj.android/jni/Application.mk
+++ b/samples/Lua/HelloLua/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
 
-APP_CPPFLAGS += -fexceptions
+APP_CPPFLAGS += -fexceptions 
 
diff --git a/samples/Lua/TestLua/proj.android/jni/Application.mk b/samples/Lua/TestLua/proj.android/jni/Application.mk
index a829fc0f48..3961feba34 100644
--- a/samples/Lua/TestLua/proj.android/jni/Application.mk
+++ b/samples/Lua/TestLua/proj.android/jni/Application.mk
@@ -2,7 +2,7 @@ APP_STL := gnustl_static
 
 # add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
 # in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
 
 APP_CPPFLAGS += -fexceptions
 
diff --git a/template/multi-platform-cpp/proj.android/jni/Application.mk b/template/multi-platform-cpp/proj.android/jni/Application.mk
index b20df4f373..ae98b275c1 100644
--- a/template/multi-platform-cpp/proj.android/jni/Application.mk
+++ b/template/multi-platform-cpp/proj.android/jni/Application.mk
@@ -1,2 +1,2 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
+APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -fsigned-char
diff --git a/template/multi-platform-js/proj.android/jni/Application.mk b/template/multi-platform-js/proj.android/jni/Application.mk
index ee36f34b40..76c0f20fca 100644
--- a/template/multi-platform-js/proj.android/jni/Application.mk
+++ b/template/multi-platform-js/proj.android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1
-APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
+APP_CPPFLAGS := -frtti 
+APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 
diff --git a/template/multi-platform-lua/proj.android/jni/Application.mk b/template/multi-platform-lua/proj.android/jni/Application.mk
index 95acd5331a..de85c24eda 100644
--- a/template/multi-platform-lua/proj.android/jni/Application.mk
+++ b/template/multi-platform-lua/proj.android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL := gnustl_static
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_CPPFLAGS += -fexceptions