From 877d8dd77125a9ce6adf33724ed10a615b6a69d7 Mon Sep 17 00:00:00 2001
From: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri, 9 May 2014 15:59:49 -0700
Subject: [PATCH] android works!!

---
 cocos/2d/platform/android/Android.mk                       | 3 ++-
 cocos/2d/platform/android/java/project.properties          | 2 +-
 .../java/src/org/cocos2dx/lib/Cocos2dxVideoView.java       | 7 ++++++-
 cocos/Android.mk                                           | 4 +---
 tests/cpp-tests/proj.android/project.properties            | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cocos/2d/platform/android/Android.mk b/cocos/2d/platform/android/Android.mk
index 244d5a85f5..ee3a4c6ccb 100644
--- a/cocos/2d/platform/android/Android.mk
+++ b/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 \
diff --git a/cocos/2d/platform/android/java/project.properties b/cocos/2d/platform/android/java/project.properties
index 88ca83f9d0..61afc8fe54 100644
--- a/cocos/2d/platform/android/java/project.properties
+++ b/cocos/2d/platform/android/java/project.properties
@@ -12,4 +12,4 @@
 
 android.library=true
 # Project target.
-target=android-10
+target=android-19
diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java
index 1679051a11..7ea5c007f7 100644
--- a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java
+++ b/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;
+    }
 }
diff --git a/cocos/Android.mk b/cocos/Android.mk
index 3898dbeb33..60cc78bb1c 100644
--- a/cocos/Android.mk
+++ b/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 \
diff --git a/tests/cpp-tests/proj.android/project.properties b/tests/cpp-tests/proj.android/project.properties
index 16f145cfc9..5a1770fd8f 100644
--- a/tests/cpp-tests/proj.android/project.properties
+++ b/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