fix android compile error

cocos/2d/CCNode.h

@@ -1048,11 +1048,6 @@ public:
      */
     virtual void setGLProgramState(GLProgramState *glProgramState);
     
-    /** Returns the Material used for this Node */
-    Material* getMaterial() const;
-    /** Sets the Material used for this Node */
-    void setMaterial(Material* material);
-    
     /// @} end of Shader Program
 
 

cocos/Android.mk

@@ -223,7 +223,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../external/poly2tri/sweep
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
-                    $(LOCAL_PATH)/. \
                     $(LOCAL_PATH)/platform \
                     $(LOCAL_PATH)/../external \
                     $(LOCAL_PATH)/../external/tinyxml2 \

cocos/audio/android/ccdandroidUtils.cpp

@@ -23,11 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "ccdandroidUtils.h"
-#include "cocos2d.h"
 
 #include <jni.h>
 #include <android/log.h>
 #include "jni/JniHelper.h"
+#include "platform/CCFileUtils.h"
+
 
 USING_NS_CC;
 

cocos/platform/android/jni/CocosPlayClient.cpp

@@ -22,11 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CocosPlayClient.h"
-#include "cocos2d.h"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 #include <map>
+#include<unordered_map>
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 #include "jni/JniHelper.h"
 #include "platform/CCCommon.h"
+#include "platform/CCFileUtils.h"
 
 using namespace cocos2d;
 

cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h

@@ -4,7 +4,6 @@
 #include <jni.h>
 #include <string>
 #include <vector>
-#include "cocos2d.h"
 
 using namespace std;
 
@@ -12,7 +11,6 @@ extern "C" {
 #include "lua.h"
 }
 
-using namespace cocos2d;
 
 #define LUAJ_ERR_OK                 0
 #define LUAJ_ERR_TYPE_NOT_SUPPORT   (-1)