From d07d054a01991fd3b2d9a2c2c36f3194018febf1 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Wed, 23 Oct 2013 17:44:20 +0800
Subject: [PATCH] issue #2905:ndk-r8e build ok now

---
 cocos/2d/Android.mk                        |  4 ----
 cocos/editor-support/cocostudio/Android.mk |  3 +--
 cocos/gui/Android.mk                       | 14 +++++++++-----
 samples/Cpp/TestCpp/Android.mk             |  5 +++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index ec9f2dbf6e..6a25764f44 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -203,10 +203,6 @@ LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,jpeg/prebuilt/android)
-$(call import-module,png/prebuilt/android)
-$(call import-module,tiff/prebuilt/android)
-$(call import-module,webp/prebuilt/android)
 $(call import-module,freetype2/prebuilt/android)
 $(call import-module,chipmunk)
 $(call import-module,2d/platform/android)
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index b9b1535fe6..ea352f8485 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -48,8 +48,7 @@ $(LOCAL_PATH)/../../../external
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
 $(LOCAL_PATH)/../../../external \
 $(LOCAL_PATH)/.. \
-$(LOCAL_PATH)/../.. \
-$(LOCAL_PATH)/../../../external
+$(LOCAL_PATH)/../..
 
 LOCAL_CFLAGS += -Wno-psabi -fexceptions
 LOCAL_EXPORT_CFLAGS += -Wno-psabi
diff --git a/cocos/gui/Android.mk b/cocos/gui/Android.mk
index 49f33a17e6..33171c7c1d 100644
--- a/cocos/gui/Android.mk
+++ b/cocos/gui/Android.mk
@@ -29,18 +29,22 @@ UISlider.cpp \
 UITextField.cpp
 
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
+$(LOCAL_PATH)/../editor-support
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
-$(LOCAL_PATH)/..
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../2d \
+$(LOCAL_PATH)/../../external \
+$(LOCAL_PATH)/.. \
+$(LOCAL_PATH)/../.. \
+$(LOCAL_PATH)/../editor-support
 
 LOCAL_CFLAGS += -Wno-psabi
 LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocostudio_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,editor-support/cocostudio)
 $(call import-module,extensions)
+$(call import-module,2d)
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk
index af16f48433..c848586fbb 100644
--- a/samples/Cpp/TestCpp/Android.mk
+++ b/samples/Cpp/TestCpp/Android.mk
@@ -141,11 +141,11 @@ Classes/ZwoptexTest/ZwoptexTest.cpp
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocosbuilder_static
 LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
 
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes
@@ -157,3 +157,4 @@ $(call import-module,editor-support/cocosbuilder)
 $(call import-module,editor-support/spine)
 $(call import-module,editor-support/cocostudio)
 $(call import-module,network)
+$(call import-module,2d)