android works!!

cocos/2d/platform/android/Android.mk

@@ -29,7 +29,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../../.. \
                     $(LOCAL_PATH)/../../../base \
                     $(LOCAL_PATH)/../../../math \
-                    $(LOCAL_PATH)/../../../physics
+                    $(LOCAL_PATH)/../../../physics \
+                    $(LOCAL_PATH)/../../../renderer
 
 LOCAL_LDLIBS := -lGLESv1_CM \
                 -lGLESv2 \

cocos/2d/platform/android/java/project.properties

@@ -12,4 +12,4 @@
 
 android.library=true
 # Project target.
-target=android-10
+target=android-19

cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java

@@ -682,5 +682,10 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl
 		// TODO Auto-generated method stub
 		return true;
 	}
-	
+
+    @Override
+    public int getAudioSessionId () {
+       // TODO Auto-generated method stub
+       return 0;
+    }
 }

cocos/Android.mk

@@ -60,8 +60,6 @@ cocos2d.cpp \
 2d/CCRenderTexture.cpp \
 2d/CCScene.cpp \
 2d/CCScriptSupport.cpp \
-2d/CCShaderCache.cpp \
-2d/ccShaders.cpp \
 2d/CCSpriteBatchNode.cpp \
 2d/CCSprite.cpp \
 2d/CCSpriteFrameCache.cpp \
@@ -144,7 +142,7 @@ renderer/CCQuadCommand.cpp \
 renderer/CCRenderCommand.cpp \
 renderer/CCRenderer.cpp \
 renderer/CCShaderCache.cpp \
-renderer/CCShaderCache.cpp \
+renderer/CCShaders.cpp \
 deprecated/CCArray.cpp \
 deprecated/CCSet.cpp \
 deprecated/CCString.cpp \

tests/cpp-tests/proj.android/project.properties

@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-19
 
 android.library.reference.1=../../../cocos/2d/platform/android/java