diff --git a/HelloLua/Classes/Android.mk b/HelloLua/Classes/Android.mk
new file mode 100644
index 0000000000..2aa7d085ed
--- /dev/null
+++ b/HelloLua/Classes/Android.mk
@@ -0,0 +1,29 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := game_logic
+
+LOCAL_SRC_FILES := \
+AppDelegate.cpp \
+../../lua/cocos2dx_support/LuaEngineImpl.cpp \
+../../lua/cocos2dx_support/Cocos2dxLuaLoader.cpp \
+../../lua/cocos2dx_support/LuaCocos2d.cpp \
+../../lua/cocos2dx_support/LuaEngine.cpp \
+../../lua/CocosDenshion_support/LuaSimpleAudioEngine.cpp
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../cocos2dx \
+                    $(LOCAL_PATH)/../../cocos2dx/platform \
+                    $(LOCAL_PATH)/../../cocos2dx/include \
+                    $(LOCAL_PATH)/../../cocos2dx/lua_support \
+                    $(LOCAL_PATH)/../../CocosDenshion/include \
+                    $(LOCAL_PATH)/../../lua/lua \
+                    $(LOCAL_PATH)/../../lua/tolua \
+                    $(LOCAL_PATH)/../../lua/cocos2dx_support \
+                    $(LOCAL_PATH)/../../lua/CocosDenshion_support
+ 
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../Android/libs/$(TARGET_ARCH_ABI)) \
+		-L$(call host-path, $(LOCAL_PATH)/../../cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) -lcurl \
+		-lcocos2d \
+		-lcocosdenshion \
+		-llua
+            
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/HelloLua/Classes/AppDelegate.cpp b/HelloLua/Classes/AppDelegate.cpp
index 6f1a9cec12..af983e2c1f 100644
--- a/HelloLua/Classes/AppDelegate.cpp
+++ b/HelloLua/Classes/AppDelegate.cpp
@@ -24,7 +24,8 @@ using namespace CocosDenshion;
 AppDelegate::AppDelegate()
 :m_pLuaEngine(NULL)
 {
-	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF|_CRTDBG_LEAK_CHECK_DF);
+	// fixed me
+	//_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF|_CRTDBG_LEAK_CHECK_DF);
 }
 
 AppDelegate::~AppDelegate()
diff --git a/HelloLua/Resource/hello.lua b/HelloLua/Resource/hello.lua
index 638204f7c7..b6eec66108 100644
--- a/HelloLua/Resource/hello.lua
+++ b/HelloLua/Resource/hello.lua
@@ -97,13 +97,13 @@ animation:addFrame(frame0)
 animation:addFrame(frame1)
 animation:setDelay(0.5)
 animation:setName('wait')
---[[
+
 animFrames = cocos2d.CCMutableArray_CCSpriteFrame__:new(2)
 animFrames:addObject(frame0)
 animFrames:addObject(frame1)
 --animation = cocos2d.CCAnimation:animationWithName("wait", 0.5, animFrames)
 animation = cocos2d.CCAnimation:animationWithFrames(animFrames,0.5)
---]]
+
 
 animation = cocos2d.CCAnimation:animationWithFrames(animFrames, 0.5)
 
diff --git a/HelloLua/android/build_native.sh b/HelloLua/android/build_native.sh
index f1130165e2..9e649f7b32 100755
--- a/HelloLua/android/build_native.sh
+++ b/HelloLua/android/build_native.sh
@@ -1,6 +1,6 @@
 # set params
-ANDROID_NDK_ROOT=/cygdrive/e/android-ndk-r5
-COCOS2DX_ROOT=/cygdrive/d/Work7/cocos2d-x
+ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6b
+COCOS2DX_ROOT=/cygdrive/e/cocos2d-x
 
 GAME_ROOT=$COCOS2DX_ROOT/HelloLua
 GAME_ANDROID_ROOT=$GAME_ROOT/android
diff --git a/HelloLua/android/jni/Android.mk b/HelloLua/android/jni/Android.mk
index 5d455d298a..e2b1dcd516 100644
--- a/HelloLua/android/jni/Android.mk
+++ b/HelloLua/android/jni/Android.mk
@@ -6,6 +6,6 @@ subdirs := $(addprefix $(LOCAL_PATH)/../../../,$(addsuffix /Android.mk, \
            CocosDenshion/android \
            lua/proj.android/jni \
 	))
-subdirs += $(LOCAL_PATH)/helloworld/Android.mk
+subdirs += $(LOCAL_PATH)/../../Classes/Android.mk $(LOCAL_PATH)/helloworld/Android.mk
 
 include $(subdirs)
diff --git a/HelloLua/android/jni/Application.mk b/HelloLua/android/jni/Application.mk
index ffaaa6b6e3..159ad1f27f 100644
--- a/HelloLua/android/jni/Application.mk
+++ b/HelloLua/android/jni/Application.mk
@@ -1,3 +1,4 @@
 # it is needed for ndk-r5
 APP_STL := stlport_static
-APP_MODULES := cocos2d cocosdenshion lua game
\ No newline at end of file
+
+APP_MODULES := cocos2d cocosdenshion lua game_logic game
\ No newline at end of file
diff --git a/HelloLua/android/jni/helloworld/Android.mk b/HelloLua/android/jni/helloworld/Android.mk
index eacc52e456..0dad951782 100644
--- a/HelloLua/android/jni/helloworld/Android.mk
+++ b/HelloLua/android/jni/helloworld/Android.mk
@@ -2,32 +2,16 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := game
 
-LOCAL_SRC_FILES := main.cpp \
-../../../Classes/AppDelegate.cpp \
-../../../../lua/cocos2dx_support/LuaEngineImpl.cpp \
-../../../../lua/cocos2dx_support/Cocos2dxLuaLoader.cpp \
-../../../../lua/cocos2dx_support/LuaCocos2d.cpp \
-../../../../lua/cocos2dx_support/LuaEngine.cpp \
-../../../../lua/CocosDenshion_support/LuaSimpleAudioEngine.cpp
+LOCAL_SRC_FILES := main.cpp 
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
                     $(LOCAL_PATH)/../../../../cocos2dx/platform \
                     $(LOCAL_PATH)/../../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../../../cocos2dx/lua_support \
-                    $(LOCAL_PATH)/../../../../CocosDenshion/include \
-                    $(LOCAL_PATH)/../../../Classes \
-                    $(LOCAL_PATH)/../../../../lua/lua \
-                    $(LOCAL_PATH)/../../../../lua/tolua \
                     $(LOCAL_PATH)/../../../../lua/cocos2dx_support \
-                    $(LOCAL_PATH)/../../../../lua/CocosDenshion_support
-# it is used for ndk-r5  
-# if you build with ndk-r4, comment it  
-# because the new Windows toolchain doesn't support Cygwin's drive
-# mapping (i.e /cygdrive/c/ instead of C:/)  
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
-		-L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl \
+                    $(LOCAL_PATH)/../../../Classes 
+
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
 		-lcocos2d \
-		-lcocosdenshion \
-		-llua
+		-lgame_logic
             
 include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/HelloLua/android/src/org/cocos2dx/hellolua/HelloLua.java b/HelloLua/android/src/org/cocos2dx/hellolua/HelloLua.java
index 762f6d1735..ad61ccfd01 100644
--- a/HelloLua/android/src/org/cocos2dx/hellolua/HelloLua.java
+++ b/HelloLua/android/src/org/cocos2dx/hellolua/HelloLua.java
@@ -60,6 +60,7 @@ public class HelloLua extends Cocos2dxActivity{
          System.loadLibrary("cocos2d");
          System.loadLibrary("cocosdenshion");
          System.loadLibrary("lua");
+         System.loadLibrary("game_logic");
          System.loadLibrary("game");
      }
 }
diff --git a/HelloWorld/Classes/Android.mk b/HelloWorld/Classes/Android.mk
new file mode 100644
index 0000000000..3de3012b0d
--- /dev/null
+++ b/HelloWorld/Classes/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := game_logic
+
+LOCAL_SRC_FILES := AppDelegate.cpp \
+                   HelloWorldScene.cpp
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../cocos2dx \
+                    $(LOCAL_PATH)/../../cocos2dx/platform \
+                    $(LOCAL_PATH)/../../cocos2dx/include \
+                    $(LOCAL_PATH)/../../CocosDenshion/include \
+                    $(LOCAL_PATH)/../../cocos2dx/lua_support 
+
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../android/libs/$(TARGET_ARCH_ABI)) \
+                -lcocos2d -lcocosdenshion \
+                -L$(call host-path, $(LOCAL_PATH)/../../cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) -lcurl
+            
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/HelloWorld/android/build.properties b/HelloWorld/android/build.properties
deleted file mode 100644
index ee52d86d94..0000000000
--- a/HelloWorld/android/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/HelloWorld/android/build.xml b/HelloWorld/android/build.xml
deleted file mode 100644
index 768294d19c..0000000000
--- a/HelloWorld/android/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="HelloWorld" default="help">
-
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="build.properties" />
-
-    <!-- The default.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
-
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <setup> task.
-             - customize it to your needs.
-         - Customize the whole script.
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
-             - customize to your needs.
-    -->
-    <setup />
-
-</project>
diff --git a/HelloWorld/android/build_native.sh b/HelloWorld/android/build_native.sh
index 115d83cb90..ae927d8043 100644
--- a/HelloWorld/android/build_native.sh
+++ b/HelloWorld/android/build_native.sh
@@ -1,5 +1,5 @@
 # set params
-ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6
+ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6b
 COCOS2DX_ROOT=/cygdrive/e/cocos2d-x
 HELLOWORLD_ROOT=$COCOS2DX_ROOT/HelloWorld/android
 
diff --git a/HelloWorld/android/jni/Android.mk b/HelloWorld/android/jni/Android.mk
index bdef5abe06..87e30c591e 100644
--- a/HelloWorld/android/jni/Android.mk
+++ b/HelloWorld/android/jni/Android.mk
@@ -5,6 +5,6 @@ subdirs := $(addprefix $(LOCAL_PATH)/../../../,$(addsuffix /Android.mk, \
            cocos2dx \
            CocosDenshion/android \
 	))
-subdirs += $(LOCAL_PATH)/helloworld/Android.mk
+subdirs += $(LOCAL_PATH)/../../Classes/Android.mk $(LOCAL_PATH)/helloworld/Android.mk
 
 include $(subdirs)
diff --git a/HelloWorld/android/jni/Application.mk b/HelloWorld/android/jni/Application.mk
index 40ab23a70f..949f3e9f17 100644
--- a/HelloWorld/android/jni/Application.mk
+++ b/HelloWorld/android/jni/Application.mk
@@ -1,4 +1,6 @@
 # it is needed for ndk-r5
 APP_STL := stlport_static
 
-APP_MODULES := cocos2d cocosdenshion helloworld
\ No newline at end of file
+APP_ABI := armeabi armeabi-v7a
+
+APP_MODULES := cocos2d cocosdenshion game_logic helloworld
\ No newline at end of file
diff --git a/HelloWorld/android/jni/helloworld/Android.mk b/HelloWorld/android/jni/helloworld/Android.mk
index 76214b8f5b..b243aec831 100644
--- a/HelloWorld/android/jni/helloworld/Android.mk
+++ b/HelloWorld/android/jni/helloworld/Android.mk
@@ -2,23 +2,14 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := helloworld
 
-LOCAL_SRC_FILES := main.cpp \
-../../../Classes/AppDelegate.cpp \
-../../../Classes/HelloWorldScene.cpp
+LOCAL_SRC_FILES := main.cpp
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
                     $(LOCAL_PATH)/../../../../cocos2dx/platform \
                     $(LOCAL_PATH)/../../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../../../cocos2dx/lua_support \
-                    $(LOCAL_PATH)/../../../../CocosDenshion/include \
                     $(LOCAL_PATH)/../../../Classes
 
-# it is used for ndk-r5  
-# if you build with ndk-r4, comment it  
-# because the new Windows toolchain doesn't support Cygwin's drive
-# mapping (i.e /cygdrive/c/ instead of C:/)  
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
-                -lcocos2d -llog -lcocosdenshion \
-                -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
+                -lcocos2d -llog -lgame_logic
             
 include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/HelloWorld/android/local.properties b/HelloWorld/android/local.properties
deleted file mode 100644
index ba25bfda91..0000000000
--- a/HelloWorld/android/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/laschweinski/android/android-sdk-linux_86
diff --git a/HelloWorld/android/proguard.cfg b/HelloWorld/android/proguard.cfg
deleted file mode 100644
index b1cdf17b5b..0000000000
--- a/HelloWorld/android/proguard.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
diff --git a/HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java b/HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java
index 1351b74c59..dd74d421eb 100644
--- a/HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java
+++ b/HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java
@@ -58,6 +58,7 @@ public class ApplicationDemo extends Cocos2dxActivity{
      static {
     	 System.loadLibrary("cocos2d");
     	 System.loadLibrary("cocosdenshion");
+    	 System.loadLibrary("game_logic");
          System.loadLibrary("helloworld");
      }
 }
diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk
index f806b8c242..4d66db1dd1 100644
--- a/cocos2dx/Android.mk
+++ b/cocos2dx/Android.mk
@@ -104,21 +104,15 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \
 touch_dispatcher/CCTouchDispatcher.cpp \
 touch_dispatcher/CCTouchHandler.cpp 
 
-
-
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
                     $(LOCAL_PATH)/include \
                     $(LOCAL_PATH)/platform \
                     $(LOCAL_PATH)/platform/third_party/android/iconv \
                     $(LOCAL_PATH)/platform/third_party/android/libpng \
                     $(LOCAL_PATH)/platform/third_party/android/libxml2 \
-                    $(LOCAL_PATH)/platform/third_party/android/libjpeg                 
+                    $(LOCAL_PATH)/platform/third_party/android/libjpeg           
 
-# it is used for ndk-r5  
-# if you build with ndk-r4, comment it   
-# because the new Windows toolchain doesn't support Cygwin's drive
-# mapping (i.e /cygdrive/c/ instead of C:/)  
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) \
                  -lGLESv1_CM -llog -lz \
                  -lpng \
                  -lxml2 \
diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libcurl.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libcurl.a.REMOVED.git-id
new file mode 100644
index 0000000000..85faa41a12
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libcurl.a.REMOVED.git-id
@@ -0,0 +1 @@
+89c49d395ece44cf2d891cd5c2a84f819e229d30
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libiconv.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libiconv.a.REMOVED.git-id
new file mode 100644
index 0000000000..58dbd5283f
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libiconv.a.REMOVED.git-id
@@ -0,0 +1 @@
+ed7341a4fe082dfc3323ab2808729baf6faf72a6
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id
new file mode 100644
index 0000000000..124780e2de
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id
@@ -0,0 +1 @@
+09011474ff4df140a34e82e7cdb5c86cf9a522bc
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id
new file mode 100644
index 0000000000..91949aab14
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id
@@ -0,0 +1 @@
+d3c4c2e8858fd0eb83f2f4f8e501d10394836add
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id
new file mode 100644
index 0000000000..099c19a8ca
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id
@@ -0,0 +1 @@
+9666bcac0a33d1dcfd5361266eca55f1bace1daf
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/libcurl.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi/libcurl.a.REMOVED.git-id
similarity index 100%
rename from cocos2dx/platform/third_party/android/libraries/libcurl.a.REMOVED.git-id
rename to cocos2dx/platform/third_party/android/libraries/armeabi/libcurl.a.REMOVED.git-id
diff --git a/cocos2dx/platform/third_party/android/libraries/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id
similarity index 100%
rename from cocos2dx/platform/third_party/android/libraries/libjpeg.a.REMOVED.git-id
rename to cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id
diff --git a/cocos2dx/platform/third_party/android/libraries/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id
similarity index 100%
rename from cocos2dx/platform/third_party/android/libraries/libpng.a.REMOVED.git-id
rename to cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id
diff --git a/cocos2dx/platform/third_party/android/libraries/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id
similarity index 100%
rename from cocos2dx/platform/third_party/android/libraries/libxml2.a.REMOVED.git-id
rename to cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id
diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libcurl.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/x86/libcurl.a.REMOVED.git-id
new file mode 100644
index 0000000000..9747da75e9
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/x86/libcurl.a.REMOVED.git-id
@@ -0,0 +1 @@
+fca1b81187a22728c6c352f121ac03f8abf2ae75
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libiconv.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/x86/libiconv.a.REMOVED.git-id
new file mode 100644
index 0000000000..a42972f326
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/x86/libiconv.a.REMOVED.git-id
@@ -0,0 +1 @@
+f8727a9fe8bb39473706cd3b98cb9a12a4304c6f
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id
new file mode 100644
index 0000000000..c74dda1967
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id
@@ -0,0 +1 @@
+42f26e695ffe165b38102fd3b9bd0e2be617bf2b
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id
new file mode 100644
index 0000000000..7cc65fe607
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id
@@ -0,0 +1 @@
+e3e0e06dbb367746764f6b1146884f6ef75bb5a2
\ No newline at end of file
diff --git a/cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id
new file mode 100644
index 0000000000..0e52a14480
--- /dev/null
+++ b/cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id
@@ -0,0 +1 @@
+3100e9f83cf078971b4b48b757bf5ebac2d02d37
\ No newline at end of file
diff --git a/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id b/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
index d38fdef326..4f6cf8b449 100644
--- a/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
+++ b/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
@@ -1 +1 @@
-dd5941759f1e46eade02974d86ba7cbe12e19a17
\ No newline at end of file
+951c67fac55daba4ee275b27a56bc63831d0ac44
\ No newline at end of file
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 0000000000..0ef59b3d42
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,108 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := game_logic
+
+LOCAL_SRC_FILES := \
+tests/AccelerometerTest/AccelerometerTest.cpp \
+tests/ActionManagerTest/ActionManagerTest.cpp \
+tests/ActionsTest/ActionsTest.cpp \
+tests/Box2DTest/Box2dTest.cpp \
+tests/Box2DTestBed/Box2dView.cpp \
+tests/Box2DTestBed/GLES-Render.cpp \
+tests/Box2DTestBed/Test.cpp \
+tests/Box2DTestBed/TestEntries.cpp \
+tests/BugsTest/Bug-1159.cpp \
+tests/BugsTest/Bug-1174.cpp \
+tests/BugsTest/Bug-350.cpp \
+tests/BugsTest/Bug-422.cpp \
+tests/BugsTest/Bug-624.cpp \
+tests/BugsTest/Bug-886.cpp \
+tests/BugsTest/Bug-899.cpp \
+tests/BugsTest/Bug-914.cpp \
+tests/BugsTest/BugsTest.cpp \
+tests/BugsTest/Bug-458/Bug-458.cpp \
+tests/BugsTest/Bug-458/QuestionContainerSprite.cpp \
+tests/ChipmunkTest/Bounce.cpp \
+tests/ChipmunkTest/Joints.cpp \
+tests/ChipmunkTest/LogoSmash.cpp \
+tests/ChipmunkTest/MagnetsElectric.cpp \
+tests/ChipmunkTest/OneWay.cpp \
+tests/ChipmunkTest/Planet.cpp \
+tests/ChipmunkTest/Player.cpp \
+tests/ChipmunkTest/Plink.cpp \
+tests/ChipmunkTest/Pump.cpp \
+tests/ChipmunkTest/PyramidStack.cpp \
+tests/ChipmunkTest/PyramidTopple.cpp \
+tests/ChipmunkTest/Query.cpp \
+tests/ChipmunkTest/Sensors.cpp \
+tests/ChipmunkTest/Simple.cpp \
+tests/ChipmunkTest/Springies.cpp \
+tests/ChipmunkTest/Tank.cpp \
+tests/ChipmunkTest/TheoJansen.cpp \
+tests/ChipmunkTest/Tumble.cpp \
+tests/ChipmunkTest/UnsafeOps.cpp \
+tests/ChipmunkTest/cocos2dChipmunkDemo.cpp \
+tests/ChipmunkTest/drawSpace.cpp \
+tests/ClickAndMoveTest/ClickAndMoveTest.cpp \
+tests/CocosDenshionTest/CocosDenshionTest.cpp \
+tests/CocosNodeTest/CocosNodeTest.cpp \
+tests/CurlTest/CurlTest.cpp \
+tests/CurrentLanguageTest/CurrentLanguageTest.cpp \
+tests/DirectorTest/DirectorTest.cpp \
+tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
+tests/EaseActionsTest/EaseActionsTest.cpp \
+tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
+tests/EffectsTest/EffectsTest.cpp \
+tests/FontTest/FontTest.cpp \
+tests/HiResTest/HiResTest.cpp \
+tests/IntervalTest/IntervalTest.cpp \
+tests/KeypadTest/KeypadTest.cpp \
+tests/LabelTest/LabelTest.cpp \
+tests/LayerTest/LayerTest.cpp \
+tests/TextInputTest/TextInputTest.cpp \
+tests/MenuTest/MenuTest.cpp \
+tests/MotionStreakTest/MotionStreakTest.cpp \
+tests/ParallaxTest/ParallaxTest.cpp \
+tests/ParticleTest/ParticleTest.cpp \
+tests/PerformanceTest/PerformanceNodeChildrenTest.cpp \
+tests/PerformanceTest/PerformanceParticleTest.cpp \
+tests/PerformanceTest/PerformanceSpriteTest.cpp \
+tests/PerformanceTest/PerformanceTest.cpp \
+tests/PerformanceTest/PerformanceTextureTest.cpp \
+tests/PerformanceTest/PerformanceTouchesTest.cpp \
+tests/ProgressActionsTest/ProgressActionsTest.cpp \
+tests/RenderTextureTest/RenderTextureTest.cpp \
+tests/RotateWorldTest/RotateWorldTest.cpp \
+tests/SceneTest/SceneTest.cpp \
+tests/SchedulerTest/SchedulerTest.cpp \
+tests/SpriteTest/SpriteTest.cpp \
+tests/TextureCacheTest/TextureCacheTest.cpp \
+tests/Texture2dTest/Texture2dTest.cpp \
+tests/TileMapTest/TileMapTest.cpp \
+tests/TouchesTest/Ball.cpp \
+tests/TouchesTest/Paddle.cpp \
+tests/TouchesTest/TouchesTest.cpp \
+tests/TransitionsTest/TransitionsTest.cpp \
+tests/UserDefaultTest/UserDefaultTest.cpp \
+tests/ZwoptexTest/ZwoptexTest.cpp \
+tests/controller.cpp \
+tests/testBasic.cpp \
+AppDelegate.cpp
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../cocos2dx \
+                   $(LOCAL_PATH)/../cocos2dx/include \
+                   $(LOCAL_PATH)/../cocos2dx/platform \
+                   $(LOCAL_PATH)/../cocos2dx/platform/third_party/android/ \
+                   $(LOCAL_PATH)/../chipmunk/include/chipmunk \
+                   $(LOCAL_PATH)/../CocosDenshion/include \
+                   $(LOCAL_PATH)/..
+                
+   
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/test.android/libs/$(TARGET_ARCH_ABI)) \
+                -lGLESv1_CM \
+                -lcocos2d -llog -lcocosdenshion \
+                -lbox2d -lchipmunk \
+                -L$(call host-path, $(LOCAL_PATH)/../cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) -lcurl
+            
+include $(BUILD_SHARED_LIBRARY)
+                   
diff --git a/tests/test.android/build_native.sh b/tests/test.android/build_native.sh
index 008817f290..c478c196ec 100644
--- a/tests/test.android/build_native.sh
+++ b/tests/test.android/build_native.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # set params
-ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6
+ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6b
 COCOS2DX_ROOT=/cygdrive/e/cocos2d-x
 TESTS_ROOT=$COCOS2DX_ROOT/tests/test.android
 
diff --git a/tests/test.android/jni/Android.mk b/tests/test.android/jni/Android.mk
index 681a7bc9a3..392ac9e3d8 100644
--- a/tests/test.android/jni/Android.mk
+++ b/tests/test.android/jni/Android.mk
@@ -4,10 +4,10 @@ include $(CLEAR_VARS)
 subdirs := $(addprefix $(LOCAL_PATH)/../../../,$(addsuffix /Android.mk, \
         Box2D \
         chipmunk \
-	cocos2dx \
-	CocosDenshion/android \
-	))
+	      cocos2dx \
+	      CocosDenshion/android \
+	      ))
 	
-subdirs += $(LOCAL_PATH)/tests/Android.mk
+subdirs += $(LOCAL_PATH)/../../Android.mk $(LOCAL_PATH)/tests/Android.mk
 
 include $(subdirs)
diff --git a/tests/test.android/jni/Application.mk b/tests/test.android/jni/Application.mk
index 3fa7ae5711..d5df2bccd5 100644
--- a/tests/test.android/jni/Application.mk
+++ b/tests/test.android/jni/Application.mk
@@ -2,4 +2,4 @@
 APP_STL := stlport_static
 APP_ABI := armeabi armeabi-v7a
 
-APP_MODULES := cocos2d cocosdenshion chipmunk box2d tests
+APP_MODULES := cocos2d cocosdenshion chipmunk box2d game_logic tests
diff --git a/tests/test.android/jni/tests/Android.mk b/tests/test.android/jni/tests/Android.mk
index a6d356ff83..6191eb4b52 100644
--- a/tests/test.android/jni/tests/Android.mk
+++ b/tests/test.android/jni/tests/Android.mk
@@ -2,113 +2,17 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := tests
 
-LOCAL_SRC_FILES := main.cpp \
-../../../tests/AccelerometerTest/AccelerometerTest.cpp \
-../../../tests/ActionManagerTest/ActionManagerTest.cpp \
-../../../tests/ActionsTest/ActionsTest.cpp \
-../../../tests/Box2DTest/Box2dTest.cpp \
-../../../tests/Box2DTestBed/Box2dView.cpp \
-../../../tests/Box2DTestBed/GLES-Render.cpp \
-../../../tests/Box2DTestBed/Test.cpp \
-../../../tests/Box2DTestBed/TestEntries.cpp \
-../../../tests/BugsTest/Bug-1159.cpp \
-../../../tests/BugsTest/Bug-1174.cpp \
-../../../tests/BugsTest/Bug-350.cpp \
-../../../tests/BugsTest/Bug-422.cpp \
-../../../tests/BugsTest/Bug-624.cpp \
-../../../tests/BugsTest/Bug-886.cpp \
-../../../tests/BugsTest/Bug-899.cpp \
-../../../tests/BugsTest/Bug-914.cpp \
-../../../tests/BugsTest/BugsTest.cpp \
-../../../tests/BugsTest/Bug-458/Bug-458.cpp \
-../../../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp \
-../../../tests/ChipmunkTest/Bounce.cpp \
-../../../tests/ChipmunkTest/Joints.cpp \
-../../../tests/ChipmunkTest/LogoSmash.cpp \
-../../../tests/ChipmunkTest/MagnetsElectric.cpp \
-../../../tests/ChipmunkTest/OneWay.cpp \
-../../../tests/ChipmunkTest/Planet.cpp \
-../../../tests/ChipmunkTest/Player.cpp \
-../../../tests/ChipmunkTest/Plink.cpp \
-../../../tests/ChipmunkTest/Pump.cpp \
-../../../tests/ChipmunkTest/PyramidStack.cpp \
-../../../tests/ChipmunkTest/PyramidTopple.cpp \
-../../../tests/ChipmunkTest/Query.cpp \
-../../../tests/ChipmunkTest/Sensors.cpp \
-../../../tests/ChipmunkTest/Simple.cpp \
-../../../tests/ChipmunkTest/Springies.cpp \
-../../../tests/ChipmunkTest/Tank.cpp \
-../../../tests/ChipmunkTest/TheoJansen.cpp \
-../../../tests/ChipmunkTest/Tumble.cpp \
-../../../tests/ChipmunkTest/UnsafeOps.cpp \
-../../../tests/ChipmunkTest/cocos2dChipmunkDemo.cpp \
-../../../tests/ChipmunkTest/drawSpace.cpp \
-../../../tests/ClickAndMoveTest/ClickAndMoveTest.cpp \
-../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \
-../../../tests/CocosNodeTest/CocosNodeTest.cpp \
-../../../tests/CurlTest/CurlTest.cpp \
-../../../tests/CurrentLanguageTest/CurrentLanguageTest.cpp \
-../../../tests/DirectorTest/DirectorTest.cpp \
-../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
-../../../tests/EaseActionsTest/EaseActionsTest.cpp \
-../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
-../../../tests/EffectsTest/EffectsTest.cpp \
-../../../tests/FontTest/FontTest.cpp \
-../../../tests/HiResTest/HiResTest.cpp \
-../../../tests/IntervalTest/IntervalTest.cpp \
-../../../tests/KeypadTest/KeypadTest.cpp \
-../../../tests/LabelTest/LabelTest.cpp \
-../../../tests/LayerTest/LayerTest.cpp \
-../../../tests/TextInputTest/TextInputTest.cpp \
-../../../tests/MenuTest/MenuTest.cpp \
-../../../tests/MotionStreakTest/MotionStreakTest.cpp \
-../../../tests/ParallaxTest/ParallaxTest.cpp \
-../../../tests/ParticleTest/ParticleTest.cpp \
-../../../tests/PerformanceTest/PerformanceNodeChildrenTest.cpp \
-../../../tests/PerformanceTest/PerformanceParticleTest.cpp \
-../../../tests/PerformanceTest/PerformanceSpriteTest.cpp \
-../../../tests/PerformanceTest/PerformanceTest.cpp \
-../../../tests/PerformanceTest/PerformanceTextureTest.cpp \
-../../../tests/PerformanceTest/PerformanceTouchesTest.cpp \
-../../../tests/ProgressActionsTest/ProgressActionsTest.cpp \
-../../../tests/RenderTextureTest/RenderTextureTest.cpp \
-../../../tests/RotateWorldTest/RotateWorldTest.cpp \
-../../../tests/SceneTest/SceneTest.cpp \
-../../../tests/SchedulerTest/SchedulerTest.cpp \
-../../../tests/SpriteTest/SpriteTest.cpp \
-../../../tests/TextureCacheTest/TextureCacheTest.cpp \
-../../../tests/Texture2dTest/Texture2dTest.cpp \
-../../../tests/TileMapTest/TileMapTest.cpp \
-../../../tests/TouchesTest/Ball.cpp \
-../../../tests/TouchesTest/Paddle.cpp \
-../../../tests/TouchesTest/TouchesTest.cpp \
-../../../tests/TransitionsTest/TransitionsTest.cpp \
-../../../tests/UserDefaultTest/UserDefaultTest.cpp \
-../../../tests/ZwoptexTest/ZwoptexTest.cpp \
-../../../tests/controller.cpp \
-../../../tests/testBasic.cpp \
-../../../AppDelegate.cpp
+LOCAL_SRC_FILES := main.cpp
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
-                   $(LOCAL_PATH)/../../../../cocos2dx/include \
-                   $(LOCAL_PATH)/../../../../cocos2dx/platform \
-                   $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/ \
-                   $(LOCAL_PATH)/../../../tests \
-                   $(LOCAL_PATH)/../../../.. \
-                   $(LOCAL_PATH)/../../.. \
-                   $(LOCAL_PATH)/../../../../chipmunk/include/chipmunk \
-                   $(LOCAL_PATH)/../../../../CocosDenshion/include 
+                    $(LOCAL_PATH)/../../../../cocos2dx/platform \
+                    $(LOCAL_PATH)/../../../../cocos2dx/include \
+                    $(LOCAL_PATH)/../../.. 
                 
-
-# it is used for ndk-r5    
-# if you build with ndk-r4, comment it   
-# because the new Windows toolchain doesn't support Cygwin's drive
-# mapping (i.e /cygdrive/c/ instead of C:/)    
-LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
+  
+LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
                 -lGLESv1_CM \
-                -lcocos2d -llog -lcocosdenshion \
-                -lbox2d -lchipmunk \
-                -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
+                -lcocos2d -llog -lgame_logic
             
 include $(BUILD_SHARED_LIBRARY)
                    
diff --git a/tests/test.android/src/org/cocos2dx/tests/TestsDemo.java b/tests/test.android/src/org/cocos2dx/tests/TestsDemo.java
index 5d64724558..067a5e5b2c 100644
--- a/tests/test.android/src/org/cocos2dx/tests/TestsDemo.java
+++ b/tests/test.android/src/org/cocos2dx/tests/TestsDemo.java
@@ -63,6 +63,7 @@ public class TestsDemo extends Cocos2dxActivity{
     	 System.loadLibrary("chipmunk");
     	 System.loadLibrary("box2d");
     	 System.loadLibrary("cocos2d");
+    	 System.loadLibrary("game_logic");
          System.loadLibrary("tests");
      }     
 }