From e50f9fc43b47a24f8e51cb859635abac9edb90b8 Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Thu, 17 Oct 2013 15:04:30 +0800
Subject: [PATCH] issue #2905: jsbinding samples and lua binding samples build
 ok on android

---
 cocos/2d/Android.mk                           |   4 +-
 cocos/editor-support/cocosbuilder/Android.mk  |   2 +-
 cocos/editor-support/cocostudio/Android.mk    |   2 +
 .../scripting/javascript/bindings/Android.mk  |   2 -
 cocos/scripting/lua/bindings/Android.mk       |  84 +++++++++---------
 cocos/scripting/lua/bindings/CCBProxy.h       |   2 +-
 .../lua/bindings/LuaOpengl.cpp.REMOVED.git-id |   2 +-
 .../lua/bindings/LuaScriptHandlerMgr.cpp      |   2 +-
 external/lua/luajit/.DS_Store                 | Bin 0 -> 6148 bytes
 .../luajit/{ => prebuilt/android}/Android.mk  |   4 +-
 .../armeabi-v7a/libluajit.a.REMOVED.git-id    |   0
 .../armeabi/libluajit.a.REMOVED.git-id        |   0
 .../android/x86/libluajit.a.REMOVED.git-id    |   0
 .../ios/libluajit.a.REMOVED.git-id            |   0
 .../mac/libluajit.a.REMOVED.git-id            |   0
 .../win32/lua51.dll.REMOVED.git-id            |   0
 .../luajit/{LuaJIT-2.0.1 => src}/COPYRIGHT    |   0
 .../lua/luajit/{LuaJIT-2.0.1 => src}/Makefile |   0
 .../lua/luajit/{LuaJIT-2.0.1 => src}/README   |   0
 .../doc/bluequad-print.css                    |   0
 .../{LuaJIT-2.0.1 => src}/doc/bluequad.css    |   0
 .../{LuaJIT-2.0.1 => src}/doc/changes.html    |   0
 .../{LuaJIT-2.0.1 => src}/doc/contact.html    |   0
 .../{LuaJIT-2.0.1 => src}/doc/ext_c_api.html  |   0
 .../{LuaJIT-2.0.1 => src}/doc/ext_ffi.html    |   0
 .../doc/ext_ffi_api.html                      |   0
 .../doc/ext_ffi_semantics.html                |   0
 .../doc/ext_ffi_tutorial.html                 |   0
 .../{LuaJIT-2.0.1 => src}/doc/ext_jit.html    |   0
 .../{LuaJIT-2.0.1 => src}/doc/extensions.html |   0
 .../luajit/{LuaJIT-2.0.1 => src}/doc/faq.html |   0
 .../{LuaJIT-2.0.1 => src}/doc/install.html    |   0
 .../{LuaJIT-2.0.1 => src}/doc/luajit.html     |   0
 .../{LuaJIT-2.0.1 => src}/doc/running.html    |   0
 .../{LuaJIT-2.0.1 => src}/doc/status.html     |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.h   |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.lua |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.h  |   0
 .../dynasm/dasm_mips.lua                      |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.h   |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.lua |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_proto.h |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x64.lua |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.h   |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.lua |   0
 .../{LuaJIT-2.0.1 => src}/dynasm/dynasm.lua   |   0
 .../luajit/{LuaJIT-2.0.1 => src}/etc/luajit.1 |   0
 .../{LuaJIT-2.0.1 => src}/etc/luajit.pc       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/Makefile |   0
 .../{LuaJIT-2.0.1 => src}/src/Makefile.dep    |   0
 .../{LuaJIT-2.0.1 => src}/src/host/README     |   0
 .../{LuaJIT-2.0.1 => src}/src/host/buildvm.c  |   0
 .../{LuaJIT-2.0.1 => src}/src/host/buildvm.h  |   0
 .../src/host/buildvm_asm.c                    |   0
 .../src/host/buildvm_fold.c                   |   0
 .../src/host/buildvm_lib.c                    |   0
 .../src/host/buildvm_peobj.c                  |   0
 .../src/host/genminilua.lua                   |   0
 .../src/host/minilua.c.REMOVED.git-id         |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/bc.lua      |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/bcsave.lua  |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/dis_arm.lua |   0
 .../src/jit/dis_mips.lua                      |   0
 .../src/jit/dis_mipsel.lua                    |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/dis_ppc.lua |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/dis_x64.lua |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/dis_x86.lua |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/dump.lua    |   0
 .../{LuaJIT-2.0.1 => src}/src/jit/v.lua       |   0
 .../{LuaJIT-2.0.1 => src}/src/lauxlib.h       |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_aux.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_base.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_bit.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_debug.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_ffi.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_init.c      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lib_io.c |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_jit.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_math.c      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lib_os.c |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_package.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_string.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lib_table.c     |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj.supp  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_alloc.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_alloc.h      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_api.c |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_arch.h       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_asm_arm.h    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_asm_mips.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_asm_ppc.h    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_asm_x86.h    |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.c  |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_bcdump.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_bcread.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_bcwrite.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_carith.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_carith.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ccall.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ccall.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ccallback.c  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ccallback.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cconv.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cconv.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cdata.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cdata.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_char.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_char.h       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_clib.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_clib.h       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cparse.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_cparse.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_crecord.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_crecord.h    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ctype.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ctype.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_debug.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_debug.h      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_def.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_dispatch.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_dispatch.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_emit_arm.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_emit_mips.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_emit_ppc.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_emit_x86.h   |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_err.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_err.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_errmsg.h     |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ff.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ffrecord.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ffrecord.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_frame.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_func.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_func.h       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.c  |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_gdbjit.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_gdbjit.h     |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.c  |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_ircall.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_iropt.h      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_jit.h |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.h |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_load.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_mcode.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_mcode.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_meta.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_meta.h       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_dce.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_fold.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_loop.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_mem.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_narrow.c |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_sink.c   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_opt_split.c  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_parse.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_parse.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_record.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_record.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_snap.c       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_snap.h       |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_state.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_state.h      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_str.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_str.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_strscan.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_strscan.h    |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_target.h     |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_target_arm.h |   0
 .../src/lj_target_mips.h                      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_target_ppc.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_target_x86.h |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_trace.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_trace.h      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_traceerr.h   |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_udata.c      |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_udata.h      |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_vm.h  |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_vmevent.c    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_vmevent.h    |   0
 .../{LuaJIT-2.0.1 => src}/src/lj_vmmath.c     |   0
 .../{LuaJIT-2.0.1 => src}/src/ljamalg.c       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lua.h    |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lua.hpp  |   0
 .../{LuaJIT-2.0.1 => src}/src/luaconf.h       |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/luajit.c |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/luajit.h |   0
 .../luajit/{LuaJIT-2.0.1 => src}/src/lualib.h |   0
 .../{LuaJIT-2.0.1 => src}/src/msvcbuild.bat   |   0
 .../src/vm_arm.dasc.REMOVED.git-id            |   0
 .../src/vm_mips.dasc.REMOVED.git-id           |   0
 .../src/vm_ppc.dasc.REMOVED.git-id            |   0
 .../src/vm_ppcspe.dasc.REMOVED.git-id         |   0
 .../src/vm_x86.dasc.REMOVED.git-id            |   0
 .../{LuaJIT-2.0.1 => src}/src/xedkbuild.bat   |   0
 .../v2.0.1_hotfix1.patch                      |   0
 samples/Cpp/TestCpp/Android.mk                |   2 -
 .../proj.android/build_native.sh              |   4 +-
 .../CocosDragonJS/proj.android/jni/Android.mk |  10 +--
 .../CrystalCraze/proj.android/build_native.sh |   4 +-
 .../CrystalCraze/proj.android/jni/Android.mk  |  10 +--
 .../MoonWarriors/proj.android/build_native.sh |   4 +-
 .../MoonWarriors/proj.android/jni/Android.mk  |  12 +--
 .../proj.android/build_native.sh              |   4 +-
 .../proj.android/jni/Android.mk               |  12 +--
 .../Lua/HelloLua/proj.android/build_native.sh |   2 +-
 .../Lua/HelloLua/proj.android/jni/Android.mk  |   2 +-
 .../Lua/TestLua/proj.android/build_native.sh  |   6 +-
 .../Lua/TestLua/proj.android/jni/Android.mk   |  15 +---
 .../proj.android/build_native.sh              |   4 +-
 .../proj.android/jni/Android.mk               |  12 +--
 .../proj.android/build_native.sh              |   6 +-
 .../proj.android/jni/Android.mk               |  11 +--
 224 files changed, 84 insertions(+), 140 deletions(-)
 create mode 100644 external/lua/luajit/.DS_Store
 rename external/lua/luajit/{ => prebuilt/android}/Android.mk (58%)
 rename external/lua/luajit/{ => prebuilt}/android/armeabi-v7a/libluajit.a.REMOVED.git-id (100%)
 rename external/lua/luajit/{ => prebuilt}/android/armeabi/libluajit.a.REMOVED.git-id (100%)
 rename external/lua/luajit/{ => prebuilt}/android/x86/libluajit.a.REMOVED.git-id (100%)
 rename external/lua/luajit/{ => prebuilt}/ios/libluajit.a.REMOVED.git-id (100%)
 rename external/lua/luajit/{ => prebuilt}/mac/libluajit.a.REMOVED.git-id (100%)
 rename external/lua/luajit/{ => prebuilt}/win32/lua51.dll.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/COPYRIGHT (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/Makefile (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/README (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/bluequad-print.css (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/bluequad.css (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/changes.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/contact.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_c_api.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_api.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_semantics.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_tutorial.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_jit.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/extensions.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/faq.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/install.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/luajit.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/running.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/status.html (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_proto.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x64.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dynasm.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/etc/luajit.1 (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/etc/luajit.pc (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/Makefile (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/Makefile.dep (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/README (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_asm.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_fold.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_lib.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_peobj.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/genminilua.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/minilua.c.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/bc.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/bcsave.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_arm.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_mips.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_mipsel.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_ppc.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_x64.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_x86.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dump.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/v.lua (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lauxlib.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_aux.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_base.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_bit.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_debug.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_ffi.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_init.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_io.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_jit.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_math.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_os.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_package.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_string.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_table.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj.supp (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_alloc.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_alloc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_api.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_arch.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_arm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_mips.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_ppc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_x86.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcdump.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcread.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcwrite.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_carith.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_carith.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccall.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccall.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccallback.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccallback.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cconv.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cconv.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cdata.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cdata.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_char.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_char.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_clib.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_clib.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cparse.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cparse.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_crecord.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_crecord.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ctype.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ctype.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_debug.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_debug.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_def.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_dispatch.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_dispatch.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_arm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_mips.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_ppc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_x86.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_err.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_err.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_errmsg.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ff.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ffrecord.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ffrecord.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_frame.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_func.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_func.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gdbjit.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gdbjit.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ircall.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_iropt.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_jit.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_load.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_mcode.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_mcode.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_meta.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_meta.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_dce.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_fold.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_loop.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_mem.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_narrow.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_sink.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_split.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_parse.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_parse.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_record.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_record.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_snap.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_snap.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_state.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_state.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_str.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_str.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_strscan.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_strscan.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_arm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_mips.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_ppc.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_x86.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_trace.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_trace.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_traceerr.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_udata.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_udata.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vm.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmevent.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmevent.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmmath.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/ljamalg.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lua.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lua.hpp (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luaconf.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luajit.c (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luajit.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lualib.h (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/msvcbuild.bat (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_arm.dasc.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_mips.dasc.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_ppc.dasc.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_ppcspe.dasc.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_x86.dasc.REMOVED.git-id (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/xedkbuild.bat (100%)
 rename external/lua/luajit/{LuaJIT-2.0.1 => src}/v2.0.1_hotfix1.patch (100%)

diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index 20017089fe..7e60320ddb 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -201,8 +201,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 
 # define the macro to compile through support/zip_support/ioapi.c
-LOCAL_CFLAGS   := -Wno-psabi -DUSE_FILE32API
+LOCAL_CFLAGS   := -Wno-psabi  -DUSE_FILE32API
+LOCAL_CPPFLAGS := -Wno-literal-suffix
 LOCAL_EXPORT_CFLAGS   := -Wno-psabi -DUSE_FILE32API
+LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk
index dd6b2b3b77..4685debd1b 100644
--- a/cocos/editor-support/cocosbuilder/Android.mk
+++ b/cocos/editor-support/cocosbuilder/Android.mk
@@ -29,7 +29,7 @@ CCScale9SpriteLoader.cpp \
 CCScrollViewLoader.cpp \
 CCSpriteLoader.cpp
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../../..
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index b7dfa3838c..380eeba149 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -56,9 +56,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,2d)
 $(call import-module,audio/android)
+$(call import-module,gui)
 
diff --git a/cocos/scripting/javascript/bindings/Android.mk b/cocos/scripting/javascript/bindings/Android.mk
index 7482cdef26..27a3b51306 100644
--- a/cocos/scripting/javascript/bindings/Android.mk
+++ b/cocos/scripting/javascript/bindings/Android.mk
@@ -52,7 +52,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 
 LOCAL_LDLIBS := -landroid
 LOCAL_LDLIBS += -llog
@@ -70,4 +69,3 @@ $(call import-module,chipmunk)
 $(call import-module,storage/local-storage)
 $(call import-module,editor-support/cocostudio)
 $(call import-module,websockets/prebuilt/android)
-$(call import-module,gui)
diff --git a/cocos/scripting/lua/bindings/Android.mk b/cocos/scripting/lua/bindings/Android.mk
index 8d1130ba3c..a5293f66a2 100644
--- a/cocos/scripting/lua/bindings/Android.mk
+++ b/cocos/scripting/lua/bindings/Android.mk
@@ -5,61 +5,59 @@ LOCAL_MODULE    := cocos_lua_static
 
 LOCAL_MODULE_FILENAME := liblua
 
-LOCAL_SRC_FILES := ../cocos2dx_support/CCLuaBridge.cpp \
-          ../cocos2dx_support/CCLuaEngine.cpp \
-          ../cocos2dx_support/CCLuaStack.cpp \
-          ../cocos2dx_support/CCLuaValue.cpp \
-          ../cocos2dx_support/Cocos2dxLuaLoader.cpp \
-          ../cocos2dx_support/CCBProxy.cpp \
-          ../cocos2dx_support/Lua_web_socket.cpp \
-          ../cocos2dx_support/LuaOpengl.cpp \
-          ../cocos2dx_support/LuaScriptHandlerMgr.cpp \
-          ../cocos2dx_support/LuaBasicConversions.cpp \
+LOCAL_SRC_FILES := CCLuaBridge.cpp \
+          CCLuaEngine.cpp \
+          CCLuaStack.cpp \
+          CCLuaValue.cpp \
+          Cocos2dxLuaLoader.cpp \
+          CCBProxy.cpp \
+          Lua_web_socket.cpp \
+          LuaOpengl.cpp \
+          LuaScriptHandlerMgr.cpp \
+          LuaBasicConversions.cpp \
           ../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \
           ../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \
-          ../cocos2dx_support/lua_cocos2dx_manual.cpp \
-          ../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \
-          ../cocos2dx_support/lua_cocos2dx_deprecated.cpp \
-          ../cocos2dx_support/platform/android/CCLuaJavaBridge.cpp \
-          ../cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
-          ../tolua/tolua_event.c \
-          ../tolua/tolua_is.c \
-          ../tolua/tolua_map.c \
-          ../tolua/tolua_push.c \
-          ../tolua/tolua_to.c \
-          ../cocos2dx_support/tolua_fix.c
+          lua_cocos2dx_manual.cpp \
+          lua_cocos2dx_extension_manual.cpp \
+          lua_cocos2dx_deprecated.cpp \
+          platform/android/CCLuaJavaBridge.cpp \
+          platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
+          ../../../../external/lua/tolua/tolua_event.c \
+          ../../../../external/lua/tolua/tolua_is.c \
+          ../../../../external/lua/tolua/tolua_map.c \
+          ../../../../external/lua/tolua/tolua_push.c \
+          ../../../../external/lua/tolua/tolua_to.c \
+          tolua_fix.c
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../luajit/include \
-                           $(LOCAL_PATH)/../tolua \
-                           $(LOCAL_PATH)/../cocos2dx_support \
-                           $(LOCAL_PATH)/../../auto-generated/lua-bindings \
-                           $(LOCAL_PATH)/../cocos2dx_support/platform/android \
-                           $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
-
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
-                    $(LOCAL_PATH)/../luajit/include \
-                    $(LOCAL_PATH)/../tolua \
-                    $(LOCAL_PATH)/../../../cocos2dx \
-                    $(LOCAL_PATH)/../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../../cocos2dx/platform \
-                    $(LOCAL_PATH)/../../../cocos2dx/platform/android \
-                    $(LOCAL_PATH)/../../../cocos2dx/kazmath/include \
-                    $(LOCAL_PATH)/../../../CocosDenshion/include \
-                    $(LOCAL_PATH)/../../../extensions \
-                    $(LOCAL_PATH)/../cocos2dx_support \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
                     $(LOCAL_PATH)/../../auto-generated/lua-bindings \
-                    $(LOCAL_PATH)/../cocos2dx_support/platform/android \
-                    $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
+                    $(LOCAL_PATH)/platform/android \
+                    $(LOCAL_PATH)/platform/android/jni \
+                    $(LOCAL_PATH)/../../../../extensions \
+                    $(LOCAL_PATH)/../../../editor-support/cocosbuilder \
+                    $(LOCAL_PATH)/../../../editor-support/cocostudio
+
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 
 LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
+LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 
 LOCAL_CFLAGS += -Wno-psabi
 LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,scripting/lua/luajit)
+$(call import-module,lua/luajit/prebuilt/android)
 $(call import-module,extensions)
+$(call import-module,2d)
+$(call import-module,websockets/prebuilt/android)
+$(call import-module,network)
+$(call import-module,editor-support/cocostudio)
+$(call import-module,editor-support/cocosbuilder)
diff --git a/cocos/scripting/lua/bindings/CCBProxy.h b/cocos/scripting/lua/bindings/CCBProxy.h
index 082bf09db1..a073db913b 100644
--- a/cocos/scripting/lua/bindings/CCBProxy.h
+++ b/cocos/scripting/lua/bindings/CCBProxy.h
@@ -4,7 +4,7 @@
 #include "cocos2d.h"
 #include "CCLuaEngine.h"
 #include "SimpleAudioEngine.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "cocosbuilder/CocosBuilder.h"
 
 USING_NS_CC;
diff --git a/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id b/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id
index a50fda9d51..bc4c41058d 100644
--- a/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id
+++ b/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id
@@ -1 +1 @@
-a57fbb5f0f9564858ced00cf47af905e6a7900c6
\ No newline at end of file
+4456a3ba6fbd68175b40e607c6bc19bdfc378ce1
\ No newline at end of file
diff --git a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp
index 7b663307a3..ab4d01bd01 100644
--- a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp
+++ b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp
@@ -10,7 +10,7 @@ extern "C" {
 #include <string>
 #include "LuaScriptHandlerMgr.h"
 #include "cocos2d.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "CCLuaStack.h"
 #include "CCLuaValue.h"
 #include "CCLuaEngine.h"
diff --git a/external/lua/luajit/.DS_Store b/external/lua/luajit/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/external/lua/luajit/Android.mk b/external/lua/luajit/prebuilt/android/Android.mk
similarity index 58%
rename from external/lua/luajit/Android.mk
rename to external/lua/luajit/prebuilt/android/Android.mk
index 4fa444987f..f94fb6c3e4 100644
--- a/external/lua/luajit/Android.mk
+++ b/external/lua/luajit/prebuilt/android/Android.mk
@@ -3,6 +3,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := luajit_static
 LOCAL_MODULE_FILENAME := libluajit
-LOCAL_SRC_FILES := ./android/$(TARGET_ARCH_ABI)/libluajit.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 include $(PREBUILT_STATIC_LIBRARY)
diff --git a/external/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id b/external/lua/luajit/prebuilt/android/armeabi-v7a/libluajit.a.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id
rename to external/lua/luajit/prebuilt/android/armeabi-v7a/libluajit.a.REMOVED.git-id
diff --git a/external/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id b/external/lua/luajit/prebuilt/android/armeabi/libluajit.a.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id
rename to external/lua/luajit/prebuilt/android/armeabi/libluajit.a.REMOVED.git-id
diff --git a/external/lua/luajit/android/x86/libluajit.a.REMOVED.git-id b/external/lua/luajit/prebuilt/android/x86/libluajit.a.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/android/x86/libluajit.a.REMOVED.git-id
rename to external/lua/luajit/prebuilt/android/x86/libluajit.a.REMOVED.git-id
diff --git a/external/lua/luajit/ios/libluajit.a.REMOVED.git-id b/external/lua/luajit/prebuilt/ios/libluajit.a.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/ios/libluajit.a.REMOVED.git-id
rename to external/lua/luajit/prebuilt/ios/libluajit.a.REMOVED.git-id
diff --git a/external/lua/luajit/mac/libluajit.a.REMOVED.git-id b/external/lua/luajit/prebuilt/mac/libluajit.a.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/mac/libluajit.a.REMOVED.git-id
rename to external/lua/luajit/prebuilt/mac/libluajit.a.REMOVED.git-id
diff --git a/external/lua/luajit/win32/lua51.dll.REMOVED.git-id b/external/lua/luajit/prebuilt/win32/lua51.dll.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/win32/lua51.dll.REMOVED.git-id
rename to external/lua/luajit/prebuilt/win32/lua51.dll.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/COPYRIGHT b/external/lua/luajit/src/COPYRIGHT
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/COPYRIGHT
rename to external/lua/luajit/src/COPYRIGHT
diff --git a/external/lua/luajit/LuaJIT-2.0.1/Makefile b/external/lua/luajit/src/Makefile
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/Makefile
rename to external/lua/luajit/src/Makefile
diff --git a/external/lua/luajit/LuaJIT-2.0.1/README b/external/lua/luajit/src/README
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/README
rename to external/lua/luajit/src/README
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css b/external/lua/luajit/src/doc/bluequad-print.css
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css
rename to external/lua/luajit/src/doc/bluequad-print.css
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css b/external/lua/luajit/src/doc/bluequad.css
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css
rename to external/lua/luajit/src/doc/bluequad.css
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/changes.html b/external/lua/luajit/src/doc/changes.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/changes.html
rename to external/lua/luajit/src/doc/changes.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/contact.html b/external/lua/luajit/src/doc/contact.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/contact.html
rename to external/lua/luajit/src/doc/contact.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html b/external/lua/luajit/src/doc/ext_c_api.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html
rename to external/lua/luajit/src/doc/ext_c_api.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html b/external/lua/luajit/src/doc/ext_ffi.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html
rename to external/lua/luajit/src/doc/ext_ffi.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html b/external/lua/luajit/src/doc/ext_ffi_api.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html
rename to external/lua/luajit/src/doc/ext_ffi_api.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html b/external/lua/luajit/src/doc/ext_ffi_semantics.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html
rename to external/lua/luajit/src/doc/ext_ffi_semantics.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html b/external/lua/luajit/src/doc/ext_ffi_tutorial.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html
rename to external/lua/luajit/src/doc/ext_ffi_tutorial.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html b/external/lua/luajit/src/doc/ext_jit.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html
rename to external/lua/luajit/src/doc/ext_jit.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/extensions.html b/external/lua/luajit/src/doc/extensions.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/extensions.html
rename to external/lua/luajit/src/doc/extensions.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/faq.html b/external/lua/luajit/src/doc/faq.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/faq.html
rename to external/lua/luajit/src/doc/faq.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/install.html b/external/lua/luajit/src/doc/install.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/install.html
rename to external/lua/luajit/src/doc/install.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/luajit.html b/external/lua/luajit/src/doc/luajit.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/luajit.html
rename to external/lua/luajit/src/doc/luajit.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/running.html b/external/lua/luajit/src/doc/running.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/running.html
rename to external/lua/luajit/src/doc/running.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/doc/status.html b/external/lua/luajit/src/doc/status.html
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/doc/status.html
rename to external/lua/luajit/src/doc/status.html
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h b/external/lua/luajit/src/dynasm/dasm_arm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h
rename to external/lua/luajit/src/dynasm/dasm_arm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua b/external/lua/luajit/src/dynasm/dasm_arm.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua
rename to external/lua/luajit/src/dynasm/dasm_arm.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h b/external/lua/luajit/src/dynasm/dasm_mips.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h
rename to external/lua/luajit/src/dynasm/dasm_mips.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua b/external/lua/luajit/src/dynasm/dasm_mips.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua
rename to external/lua/luajit/src/dynasm/dasm_mips.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h b/external/lua/luajit/src/dynasm/dasm_ppc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h
rename to external/lua/luajit/src/dynasm/dasm_ppc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua b/external/lua/luajit/src/dynasm/dasm_ppc.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua
rename to external/lua/luajit/src/dynasm/dasm_ppc.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h b/external/lua/luajit/src/dynasm/dasm_proto.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h
rename to external/lua/luajit/src/dynasm/dasm_proto.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua b/external/lua/luajit/src/dynasm/dasm_x64.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua
rename to external/lua/luajit/src/dynasm/dasm_x64.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h b/external/lua/luajit/src/dynasm/dasm_x86.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h
rename to external/lua/luajit/src/dynasm/dasm_x86.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua b/external/lua/luajit/src/dynasm/dasm_x86.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua
rename to external/lua/luajit/src/dynasm/dasm_x86.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua b/external/lua/luajit/src/dynasm/dynasm.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua
rename to external/lua/luajit/src/dynasm/dynasm.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 b/external/lua/luajit/src/etc/luajit.1
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/etc/luajit.1
rename to external/lua/luajit/src/etc/luajit.1
diff --git a/external/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc b/external/lua/luajit/src/etc/luajit.pc
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc
rename to external/lua/luajit/src/etc/luajit.pc
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/Makefile b/external/lua/luajit/src/src/Makefile
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/Makefile
rename to external/lua/luajit/src/src/Makefile
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep b/external/lua/luajit/src/src/Makefile.dep
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep
rename to external/lua/luajit/src/src/Makefile.dep
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/README b/external/lua/luajit/src/src/host/README
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/README
rename to external/lua/luajit/src/src/host/README
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c b/external/lua/luajit/src/src/host/buildvm.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c
rename to external/lua/luajit/src/src/host/buildvm.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h b/external/lua/luajit/src/src/host/buildvm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h
rename to external/lua/luajit/src/src/host/buildvm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c b/external/lua/luajit/src/src/host/buildvm_asm.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c
rename to external/lua/luajit/src/src/host/buildvm_asm.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c b/external/lua/luajit/src/src/host/buildvm_fold.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c
rename to external/lua/luajit/src/src/host/buildvm_fold.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c b/external/lua/luajit/src/src/host/buildvm_lib.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c
rename to external/lua/luajit/src/src/host/buildvm_lib.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c b/external/lua/luajit/src/src/host/buildvm_peobj.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c
rename to external/lua/luajit/src/src/host/buildvm_peobj.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua b/external/lua/luajit/src/src/host/genminilua.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua
rename to external/lua/luajit/src/src/host/genminilua.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id b/external/lua/luajit/src/src/host/minilua.c.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id
rename to external/lua/luajit/src/src/host/minilua.c.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua b/external/lua/luajit/src/src/jit/bc.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua
rename to external/lua/luajit/src/src/jit/bc.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua b/external/lua/luajit/src/src/jit/bcsave.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua
rename to external/lua/luajit/src/src/jit/bcsave.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua b/external/lua/luajit/src/src/jit/dis_arm.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua
rename to external/lua/luajit/src/src/jit/dis_arm.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua b/external/lua/luajit/src/src/jit/dis_mips.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua
rename to external/lua/luajit/src/src/jit/dis_mips.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua b/external/lua/luajit/src/src/jit/dis_mipsel.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua
rename to external/lua/luajit/src/src/jit/dis_mipsel.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua b/external/lua/luajit/src/src/jit/dis_ppc.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua
rename to external/lua/luajit/src/src/jit/dis_ppc.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua b/external/lua/luajit/src/src/jit/dis_x64.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua
rename to external/lua/luajit/src/src/jit/dis_x64.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua b/external/lua/luajit/src/src/jit/dis_x86.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua
rename to external/lua/luajit/src/src/jit/dis_x86.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua b/external/lua/luajit/src/src/jit/dump.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua
rename to external/lua/luajit/src/src/jit/dump.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua b/external/lua/luajit/src/src/jit/v.lua
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua
rename to external/lua/luajit/src/src/jit/v.lua
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h b/external/lua/luajit/src/src/lauxlib.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h
rename to external/lua/luajit/src/src/lauxlib.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c b/external/lua/luajit/src/src/lib_aux.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c
rename to external/lua/luajit/src/src/lib_aux.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_base.c b/external/lua/luajit/src/src/lib_base.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_base.c
rename to external/lua/luajit/src/src/lib_base.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c b/external/lua/luajit/src/src/lib_bit.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c
rename to external/lua/luajit/src/src/lib_bit.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c b/external/lua/luajit/src/src/lib_debug.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c
rename to external/lua/luajit/src/src/lib_debug.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c b/external/lua/luajit/src/src/lib_ffi.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c
rename to external/lua/luajit/src/src/lib_ffi.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_init.c b/external/lua/luajit/src/src/lib_init.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_init.c
rename to external/lua/luajit/src/src/lib_init.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_io.c b/external/lua/luajit/src/src/lib_io.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_io.c
rename to external/lua/luajit/src/src/lib_io.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c b/external/lua/luajit/src/src/lib_jit.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c
rename to external/lua/luajit/src/src/lib_jit.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_math.c b/external/lua/luajit/src/src/lib_math.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_math.c
rename to external/lua/luajit/src/src/lib_math.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_os.c b/external/lua/luajit/src/src/lib_os.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_os.c
rename to external/lua/luajit/src/src/lib_os.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_package.c b/external/lua/luajit/src/src/lib_package.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_package.c
rename to external/lua/luajit/src/src/lib_package.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_string.c b/external/lua/luajit/src/src/lib_string.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_string.c
rename to external/lua/luajit/src/src/lib_string.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lib_table.c b/external/lua/luajit/src/src/lib_table.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lib_table.c
rename to external/lua/luajit/src/src/lib_table.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj.supp b/external/lua/luajit/src/src/lj.supp
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj.supp
rename to external/lua/luajit/src/src/lj.supp
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c b/external/lua/luajit/src/src/lj_alloc.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c
rename to external/lua/luajit/src/src/lj_alloc.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h b/external/lua/luajit/src/src/lj_alloc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h
rename to external/lua/luajit/src/src/lj_alloc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_api.c b/external/lua/luajit/src/src/lj_api.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_api.c
rename to external/lua/luajit/src/src/lj_api.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h b/external/lua/luajit/src/src/lj_arch.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h
rename to external/lua/luajit/src/src/lj_arch.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c b/external/lua/luajit/src/src/lj_asm.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c
rename to external/lua/luajit/src/src/lj_asm.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h b/external/lua/luajit/src/src/lj_asm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h
rename to external/lua/luajit/src/src/lj_asm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h b/external/lua/luajit/src/src/lj_asm_arm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h
rename to external/lua/luajit/src/src/lj_asm_arm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h b/external/lua/luajit/src/src/lj_asm_mips.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h
rename to external/lua/luajit/src/src/lj_asm_mips.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h b/external/lua/luajit/src/src/lj_asm_ppc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h
rename to external/lua/luajit/src/src/lj_asm_ppc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h b/external/lua/luajit/src/src/lj_asm_x86.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h
rename to external/lua/luajit/src/src/lj_asm_x86.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c b/external/lua/luajit/src/src/lj_bc.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c
rename to external/lua/luajit/src/src/lj_bc.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h b/external/lua/luajit/src/src/lj_bc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h
rename to external/lua/luajit/src/src/lj_bc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h b/external/lua/luajit/src/src/lj_bcdump.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h
rename to external/lua/luajit/src/src/lj_bcdump.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c b/external/lua/luajit/src/src/lj_bcread.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c
rename to external/lua/luajit/src/src/lj_bcread.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c b/external/lua/luajit/src/src/lj_bcwrite.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c
rename to external/lua/luajit/src/src/lj_bcwrite.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c b/external/lua/luajit/src/src/lj_carith.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c
rename to external/lua/luajit/src/src/lj_carith.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h b/external/lua/luajit/src/src/lj_carith.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h
rename to external/lua/luajit/src/src/lj_carith.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c b/external/lua/luajit/src/src/lj_ccall.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c
rename to external/lua/luajit/src/src/lj_ccall.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h b/external/lua/luajit/src/src/lj_ccall.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h
rename to external/lua/luajit/src/src/lj_ccall.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c b/external/lua/luajit/src/src/lj_ccallback.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c
rename to external/lua/luajit/src/src/lj_ccallback.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h b/external/lua/luajit/src/src/lj_ccallback.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h
rename to external/lua/luajit/src/src/lj_ccallback.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c b/external/lua/luajit/src/src/lj_cconv.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c
rename to external/lua/luajit/src/src/lj_cconv.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h b/external/lua/luajit/src/src/lj_cconv.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h
rename to external/lua/luajit/src/src/lj_cconv.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c b/external/lua/luajit/src/src/lj_cdata.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c
rename to external/lua/luajit/src/src/lj_cdata.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h b/external/lua/luajit/src/src/lj_cdata.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h
rename to external/lua/luajit/src/src/lj_cdata.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_char.c b/external/lua/luajit/src/src/lj_char.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_char.c
rename to external/lua/luajit/src/src/lj_char.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_char.h b/external/lua/luajit/src/src/lj_char.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_char.h
rename to external/lua/luajit/src/src/lj_char.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c b/external/lua/luajit/src/src/lj_clib.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c
rename to external/lua/luajit/src/src/lj_clib.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h b/external/lua/luajit/src/src/lj_clib.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h
rename to external/lua/luajit/src/src/lj_clib.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c b/external/lua/luajit/src/src/lj_cparse.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c
rename to external/lua/luajit/src/src/lj_cparse.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h b/external/lua/luajit/src/src/lj_cparse.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h
rename to external/lua/luajit/src/src/lj_cparse.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c b/external/lua/luajit/src/src/lj_crecord.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c
rename to external/lua/luajit/src/src/lj_crecord.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h b/external/lua/luajit/src/src/lj_crecord.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h
rename to external/lua/luajit/src/src/lj_crecord.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c b/external/lua/luajit/src/src/lj_ctype.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c
rename to external/lua/luajit/src/src/lj_ctype.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h b/external/lua/luajit/src/src/lj_ctype.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h
rename to external/lua/luajit/src/src/lj_ctype.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c b/external/lua/luajit/src/src/lj_debug.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c
rename to external/lua/luajit/src/src/lj_debug.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h b/external/lua/luajit/src/src/lj_debug.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h
rename to external/lua/luajit/src/src/lj_debug.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_def.h b/external/lua/luajit/src/src/lj_def.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_def.h
rename to external/lua/luajit/src/src/lj_def.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c b/external/lua/luajit/src/src/lj_dispatch.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c
rename to external/lua/luajit/src/src/lj_dispatch.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h b/external/lua/luajit/src/src/lj_dispatch.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h
rename to external/lua/luajit/src/src/lj_dispatch.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h b/external/lua/luajit/src/src/lj_emit_arm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h
rename to external/lua/luajit/src/src/lj_emit_arm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h b/external/lua/luajit/src/src/lj_emit_mips.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h
rename to external/lua/luajit/src/src/lj_emit_mips.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h b/external/lua/luajit/src/src/lj_emit_ppc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h
rename to external/lua/luajit/src/src/lj_emit_ppc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h b/external/lua/luajit/src/src/lj_emit_x86.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h
rename to external/lua/luajit/src/src/lj_emit_x86.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_err.c b/external/lua/luajit/src/src/lj_err.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_err.c
rename to external/lua/luajit/src/src/lj_err.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_err.h b/external/lua/luajit/src/src/lj_err.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_err.h
rename to external/lua/luajit/src/src/lj_err.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h b/external/lua/luajit/src/src/lj_errmsg.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h
rename to external/lua/luajit/src/src/lj_errmsg.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h b/external/lua/luajit/src/src/lj_ff.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h
rename to external/lua/luajit/src/src/lj_ff.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c b/external/lua/luajit/src/src/lj_ffrecord.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c
rename to external/lua/luajit/src/src/lj_ffrecord.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h b/external/lua/luajit/src/src/lj_ffrecord.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h
rename to external/lua/luajit/src/src/lj_ffrecord.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h b/external/lua/luajit/src/src/lj_frame.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h
rename to external/lua/luajit/src/src/lj_frame.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_func.c b/external/lua/luajit/src/src/lj_func.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_func.c
rename to external/lua/luajit/src/src/lj_func.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_func.h b/external/lua/luajit/src/src/lj_func.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_func.h
rename to external/lua/luajit/src/src/lj_func.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c b/external/lua/luajit/src/src/lj_gc.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c
rename to external/lua/luajit/src/src/lj_gc.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h b/external/lua/luajit/src/src/lj_gc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h
rename to external/lua/luajit/src/src/lj_gc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c b/external/lua/luajit/src/src/lj_gdbjit.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c
rename to external/lua/luajit/src/src/lj_gdbjit.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h b/external/lua/luajit/src/src/lj_gdbjit.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h
rename to external/lua/luajit/src/src/lj_gdbjit.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c b/external/lua/luajit/src/src/lj_ir.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c
rename to external/lua/luajit/src/src/lj_ir.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h b/external/lua/luajit/src/src/lj_ir.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h
rename to external/lua/luajit/src/src/lj_ir.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h b/external/lua/luajit/src/src/lj_ircall.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h
rename to external/lua/luajit/src/src/lj_ircall.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h b/external/lua/luajit/src/src/lj_iropt.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h
rename to external/lua/luajit/src/src/lj_iropt.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h b/external/lua/luajit/src/src/lj_jit.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h
rename to external/lua/luajit/src/src/lj_jit.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c b/external/lua/luajit/src/src/lj_lex.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c
rename to external/lua/luajit/src/src/lj_lex.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h b/external/lua/luajit/src/src/lj_lex.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h
rename to external/lua/luajit/src/src/lj_lex.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c b/external/lua/luajit/src/src/lj_lib.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c
rename to external/lua/luajit/src/src/lj_lib.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h b/external/lua/luajit/src/src/lj_lib.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h
rename to external/lua/luajit/src/src/lj_lib.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_load.c b/external/lua/luajit/src/src/lj_load.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_load.c
rename to external/lua/luajit/src/src/lj_load.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c b/external/lua/luajit/src/src/lj_mcode.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c
rename to external/lua/luajit/src/src/lj_mcode.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h b/external/lua/luajit/src/src/lj_mcode.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h
rename to external/lua/luajit/src/src/lj_mcode.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c b/external/lua/luajit/src/src/lj_meta.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c
rename to external/lua/luajit/src/src/lj_meta.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h b/external/lua/luajit/src/src/lj_meta.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h
rename to external/lua/luajit/src/src/lj_meta.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c b/external/lua/luajit/src/src/lj_obj.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c
rename to external/lua/luajit/src/src/lj_obj.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h b/external/lua/luajit/src/src/lj_obj.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h
rename to external/lua/luajit/src/src/lj_obj.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c b/external/lua/luajit/src/src/lj_opt_dce.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c
rename to external/lua/luajit/src/src/lj_opt_dce.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c b/external/lua/luajit/src/src/lj_opt_fold.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c
rename to external/lua/luajit/src/src/lj_opt_fold.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c b/external/lua/luajit/src/src/lj_opt_loop.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c
rename to external/lua/luajit/src/src/lj_opt_loop.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c b/external/lua/luajit/src/src/lj_opt_mem.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c
rename to external/lua/luajit/src/src/lj_opt_mem.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c b/external/lua/luajit/src/src/lj_opt_narrow.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c
rename to external/lua/luajit/src/src/lj_opt_narrow.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c b/external/lua/luajit/src/src/lj_opt_sink.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c
rename to external/lua/luajit/src/src/lj_opt_sink.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c b/external/lua/luajit/src/src/lj_opt_split.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c
rename to external/lua/luajit/src/src/lj_opt_split.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c b/external/lua/luajit/src/src/lj_parse.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c
rename to external/lua/luajit/src/src/lj_parse.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h b/external/lua/luajit/src/src/lj_parse.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h
rename to external/lua/luajit/src/src/lj_parse.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_record.c b/external/lua/luajit/src/src/lj_record.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_record.c
rename to external/lua/luajit/src/src/lj_record.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_record.h b/external/lua/luajit/src/src/lj_record.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_record.h
rename to external/lua/luajit/src/src/lj_record.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c b/external/lua/luajit/src/src/lj_snap.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c
rename to external/lua/luajit/src/src/lj_snap.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h b/external/lua/luajit/src/src/lj_snap.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h
rename to external/lua/luajit/src/src/lj_snap.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_state.c b/external/lua/luajit/src/src/lj_state.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_state.c
rename to external/lua/luajit/src/src/lj_state.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_state.h b/external/lua/luajit/src/src/lj_state.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_state.h
rename to external/lua/luajit/src/src/lj_state.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_str.c b/external/lua/luajit/src/src/lj_str.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_str.c
rename to external/lua/luajit/src/src/lj_str.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_str.h b/external/lua/luajit/src/src/lj_str.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_str.h
rename to external/lua/luajit/src/src/lj_str.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c b/external/lua/luajit/src/src/lj_strscan.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c
rename to external/lua/luajit/src/src/lj_strscan.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h b/external/lua/luajit/src/src/lj_strscan.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h
rename to external/lua/luajit/src/src/lj_strscan.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c b/external/lua/luajit/src/src/lj_tab.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c
rename to external/lua/luajit/src/src/lj_tab.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h b/external/lua/luajit/src/src/lj_tab.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h
rename to external/lua/luajit/src/src/lj_tab.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_target.h b/external/lua/luajit/src/src/lj_target.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_target.h
rename to external/lua/luajit/src/src/lj_target.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h b/external/lua/luajit/src/src/lj_target_arm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h
rename to external/lua/luajit/src/src/lj_target_arm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h b/external/lua/luajit/src/src/lj_target_mips.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h
rename to external/lua/luajit/src/src/lj_target_mips.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h b/external/lua/luajit/src/src/lj_target_ppc.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h
rename to external/lua/luajit/src/src/lj_target_ppc.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h b/external/lua/luajit/src/src/lj_target_x86.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h
rename to external/lua/luajit/src/src/lj_target_x86.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c b/external/lua/luajit/src/src/lj_trace.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c
rename to external/lua/luajit/src/src/lj_trace.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h b/external/lua/luajit/src/src/lj_trace.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h
rename to external/lua/luajit/src/src/lj_trace.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h b/external/lua/luajit/src/src/lj_traceerr.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h
rename to external/lua/luajit/src/src/lj_traceerr.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c b/external/lua/luajit/src/src/lj_udata.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c
rename to external/lua/luajit/src/src/lj_udata.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h b/external/lua/luajit/src/src/lj_udata.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h
rename to external/lua/luajit/src/src/lj_udata.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h b/external/lua/luajit/src/src/lj_vm.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h
rename to external/lua/luajit/src/src/lj_vm.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c b/external/lua/luajit/src/src/lj_vmevent.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c
rename to external/lua/luajit/src/src/lj_vmevent.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h b/external/lua/luajit/src/src/lj_vmevent.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h
rename to external/lua/luajit/src/src/lj_vmevent.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c b/external/lua/luajit/src/src/lj_vmmath.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c
rename to external/lua/luajit/src/src/lj_vmmath.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c b/external/lua/luajit/src/src/ljamalg.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c
rename to external/lua/luajit/src/src/ljamalg.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lua.h b/external/lua/luajit/src/src/lua.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lua.h
rename to external/lua/luajit/src/src/lua.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lua.hpp b/external/lua/luajit/src/src/lua.hpp
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lua.hpp
rename to external/lua/luajit/src/src/lua.hpp
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/luaconf.h b/external/lua/luajit/src/src/luaconf.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/luaconf.h
rename to external/lua/luajit/src/src/luaconf.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/luajit.c b/external/lua/luajit/src/src/luajit.c
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/luajit.c
rename to external/lua/luajit/src/src/luajit.c
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/luajit.h b/external/lua/luajit/src/src/luajit.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/luajit.h
rename to external/lua/luajit/src/src/luajit.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/lualib.h b/external/lua/luajit/src/src/lualib.h
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/lualib.h
rename to external/lua/luajit/src/src/lualib.h
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat b/external/lua/luajit/src/src/msvcbuild.bat
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat
rename to external/lua/luajit/src/src/msvcbuild.bat
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id b/external/lua/luajit/src/src/vm_arm.dasc.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id
rename to external/lua/luajit/src/src/vm_arm.dasc.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id b/external/lua/luajit/src/src/vm_mips.dasc.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id
rename to external/lua/luajit/src/src/vm_mips.dasc.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id b/external/lua/luajit/src/src/vm_ppc.dasc.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id
rename to external/lua/luajit/src/src/vm_ppc.dasc.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id b/external/lua/luajit/src/src/vm_ppcspe.dasc.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id
rename to external/lua/luajit/src/src/vm_ppcspe.dasc.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id b/external/lua/luajit/src/src/vm_x86.dasc.REMOVED.git-id
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id
rename to external/lua/luajit/src/src/vm_x86.dasc.REMOVED.git-id
diff --git a/external/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat b/external/lua/luajit/src/src/xedkbuild.bat
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat
rename to external/lua/luajit/src/src/xedkbuild.bat
diff --git a/external/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch b/external/lua/luajit/src/v2.0.1_hotfix1.patch
similarity index 100%
rename from external/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch
rename to external/lua/luajit/src/v2.0.1_hotfix1.patch
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk
index f54ac22e3b..00c130e372 100644
--- a/samples/Cpp/TestCpp/Android.mk
+++ b/samples/Cpp/TestCpp/Android.mk
@@ -148,7 +148,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
 LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
@@ -164,7 +163,6 @@ $(call import-module,2d)
 $(call import-module,extensions)
 $(call import-module,editor-support/cocosbuilder)
 $(call import-module,editor-support/spine)
-$(call import-module,gui)
 $(call import-module,editor-support/cocostudio)
 $(call import-module,network)
 $(call import-module,curl/prebuilt/android)
diff --git a/samples/Javascript/CocosDragonJS/proj.android/build_native.sh b/samples/Javascript/CocosDragonJS/proj.android/build_native.sh
index ba5e035c8c..768c2caf04 100755
--- a/samples/Javascript/CocosDragonJS/proj.android/build_native.sh
+++ b/samples/Javascript/CocosDragonJS/proj.android/build_native.sh
@@ -78,7 +78,7 @@ COCOS2DX_ROOT="$DIR/../../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
 RESROUCE_ROOT="$APP_ROOT/../Shared/games/CocosDragonJS/Published files Android"
-BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
+BINDINGS_JS_ROOT="$APP_ROOT/../../../cocos/scripting/javascript/script"
 
 echo
 echo "Paths"
@@ -110,5 +110,5 @@ echo
 set -x
 
 "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \
-    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \
+    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \
     NDK_LOG=0 V=0
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
index bc55bdaaf5..e06290f84b 100644
--- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
+++ b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
@@ -11,18 +11,10 @@ LOCAL_SRC_FILES := cocosdragonjs/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
-LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
 
 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
-$(call import-module,cocos2dx/platform/android)
diff --git a/samples/Javascript/CrystalCraze/proj.android/build_native.sh b/samples/Javascript/CrystalCraze/proj.android/build_native.sh
index 4c7a821642..102eefa80f 100755
--- a/samples/Javascript/CrystalCraze/proj.android/build_native.sh
+++ b/samples/Javascript/CrystalCraze/proj.android/build_native.sh
@@ -78,7 +78,7 @@ COCOS2DX_ROOT="$DIR/../../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
 RESROUCE_ROOT="$APP_ROOT/../Shared/games/CrystalCraze/Published-Android"
-BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
+BINDINGS_JS_ROOT="$APP_ROOT/../../../cocos/scripting/javascript/script"
 
 echo
 echo "Paths"
@@ -111,5 +111,5 @@ echo
 set -x
 
 "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \
-    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \
+    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \
     NDK_LOG=0 V=0
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
index 451b250c37..3258f123af 100644
--- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
+++ b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
@@ -11,18 +11,10 @@ LOCAL_SRC_FILES := crystalcraze/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
-LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
 
 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/javascript/spidermonkey-android)
 $(call import-module,scripting/javascript/bindings)
-$(call import-module,cocos2dx/platform/android)
diff --git a/samples/Javascript/MoonWarriors/proj.android/build_native.sh b/samples/Javascript/MoonWarriors/proj.android/build_native.sh
index 0b5e042a9b..e97488b40c 100755
--- a/samples/Javascript/MoonWarriors/proj.android/build_native.sh
+++ b/samples/Javascript/MoonWarriors/proj.android/build_native.sh
@@ -77,7 +77,7 @@ COCOS2DX_ROOT="$DIR/../../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
 RESROUCE_ROOT="$APP_ROOT/../Shared/games/MoonWarriors/res"
-BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
+BINDINGS_JS_ROOT="$APP_ROOT/../../../cocos/scripting/javascript/script"
 
 echo
 echo "Paths"
@@ -113,5 +113,5 @@ echo
 set -x
 
 "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \
-    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \
+    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \
     NDK_LOG=1 V=1
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
index 8f89f72ceb..c409b4790b 100644
--- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
+++ b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
@@ -11,18 +11,10 @@ LOCAL_SRC_FILES := moonwarriors/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
-LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
 
 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/javascript/spidermonkey-android)
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,cocos2dx/platform/android)
+$(call import-module,scripting/javascript/bindings
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/build_native.sh b/samples/Javascript/WatermelonWithMe/proj.android/build_native.sh
index 7eb5abe274..e976f1c2b2 100755
--- a/samples/Javascript/WatermelonWithMe/proj.android/build_native.sh
+++ b/samples/Javascript/WatermelonWithMe/proj.android/build_native.sh
@@ -77,7 +77,7 @@ COCOS2DX_ROOT="$DIR/../../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
 RESROUCE_ROOT="$APP_ROOT/../Shared/games/WatermelonWithMe"
-BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
+BINDINGS_JS_ROOT="$APP_ROOT/../../../cocos/scripting/javascript/script"
 
 echo
 echo "Paths"
@@ -109,5 +109,5 @@ echo
 set -x
 
 "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \
-    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \
+    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \
     NDK_LOG=0 V=0
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
index fd7d49998d..b666e13723 100644
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
+++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
@@ -11,18 +11,10 @@ LOCAL_SRC_FILES := watermelonwithme/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
-LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
 
 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/javascript/spidermonkey-android)
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,cocos2dx/platform/android)
+$(call import-module,scripting/javascript/bindings
diff --git a/samples/Lua/HelloLua/proj.android/build_native.sh b/samples/Lua/HelloLua/proj.android/build_native.sh
index 47bf4396ad..0e0f3662f5 100755
--- a/samples/Lua/HelloLua/proj.android/build_native.sh
+++ b/samples/Lua/HelloLua/proj.android/build_native.sh
@@ -94,7 +94,7 @@ fi
 done
 
 #copy comment script
-for file in "$APP_ROOT"/../../../scripting/lua/script/*
+for file in "$APP_ROOT"/../../../cocos/scripting/lua/script/*
 do
 if [ -d "$file" ]; then
     cp -rf "$file" "$APP_ANDROID_ROOT"/assets
diff --git a/samples/Lua/HelloLua/proj.android/jni/Android.mk b/samples/Lua/HelloLua/proj.android/jni/Android.mk
index 09d83731fb..ab19f636b8 100644
--- a/samples/Lua/HelloLua/proj.android/jni/Android.mk
+++ b/samples/Lua/HelloLua/proj.android/jni/Android.mk
@@ -16,4 +16,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,scripting/lua/proj.android)
+$(call import-module,scripting/lua/bindings)
diff --git a/samples/Lua/TestLua/proj.android/build_native.sh b/samples/Lua/TestLua/proj.android/build_native.sh
index 661dde8e12..1774c62c32 100755
--- a/samples/Lua/TestLua/proj.android/build_native.sh
+++ b/samples/Lua/TestLua/proj.android/build_native.sh
@@ -114,7 +114,7 @@ fi
 done
 
 # copy common luaScript
-for file in "$APP_ROOT"/../../../scripting/lua/script/*
+for file in "$APP_ROOT"/../../../cocos/scripting/lua/script/*
 do
 if [ -d "$file" ]; then
     cp -rf "$file" "$APP_ANDROID_ROOT"/assets
@@ -135,9 +135,9 @@ rm -f "$APP_ANDROID_ROOT"/assets/Images/test_1021x1024_a8.pvr.gz
 if [[ "$buildexternalsfromsource" ]]; then
     echo "Building external dependencies from source"
     "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \
-        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/source"
+        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external"
 else
     echo "Using prebuilt externals"
     "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \
-        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt"
+        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external"
 fi
diff --git a/samples/Lua/TestLua/proj.android/jni/Android.mk b/samples/Lua/TestLua/proj.android/jni/Android.mk
index 6f3a99a518..daadaf2a3a 100644
--- a/samples/Lua/TestLua/proj.android/jni/Android.mk
+++ b/samples/Lua/TestLua/proj.android/jni/Android.mk
@@ -14,19 +14,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
 LOCAL_STATIC_LIBRARIES := curl_static_prebuilt
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_lua_static
-LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/lua/proj.android)
-$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
-$(call import-module,extensions)
-$(call import-module,external/Box2D)
-$(call import-module,cocos2dx/platform/android)
+$(call import-module,scripting/lua/bindings)
diff --git a/template/multi-platform-cpp/proj.android/build_native.sh b/template/multi-platform-cpp/proj.android/build_native.sh
index 62f24ecb8c..47c3c53564 100755
--- a/template/multi-platform-cpp/proj.android/build_native.sh
+++ b/template/multi-platform-cpp/proj.android/build_native.sh
@@ -83,9 +83,9 @@ done
 if [[ "$buildexternalsfromsource" ]]; then
     echo "Building external dependencies from source"
     "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \
-        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/source"
+        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external"
 else
     echo "Using prebuilt externals"
     "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \
-        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt"
+        "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external"
 fi
diff --git a/template/multi-platform-cpp/proj.android/jni/Android.mk b/template/multi-platform-cpp/proj.android/jni/Android.mk
index 97616f1fba..46ea942f75 100644
--- a/template/multi-platform-cpp/proj.android/jni/Android.mk
+++ b/template/multi-platform-cpp/proj.android/jni/Android.mk
@@ -12,17 +12,13 @@ LOCAL_SRC_FILES := hellocpp/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,cocos2dx/platform/third_party/android/prebuilt/libcurl)
+$(call import-module,2d)
 $(call import-module,audio/android)
-$(call import-module,extensions)
-$(call import-module,external/Box2D)
-$(call import-module,cocos2dx/platform/android)
+$(call import-module,Box2D)
diff --git a/template/multi-platform-js/proj.android/build_native.sh b/template/multi-platform-js/proj.android/build_native.sh
index 149635b305..5a008713a3 100755
--- a/template/multi-platform-js/proj.android/build_native.sh
+++ b/template/multi-platform-js/proj.android/build_native.sh
@@ -62,7 +62,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR/../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
-BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
+BINDINGS_JS_ROOT="$APP_ROOT/../../cocos/scripting/javascript/script"
 
 echo
 echo "Paths"
@@ -88,7 +88,7 @@ cp -rf "$APP_ROOT"/Resources/* "$APP_ANDROID_ROOT"/assets
 
 
 # copy bindings/*.js into assets' root
-cp -f "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets
+cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets
 
 echo "Using prebuilt externals"
 echo
@@ -96,5 +96,5 @@ echo
 set -x
 
 "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \
-    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \
+    "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \
     NDK_LOG=0 V=0
diff --git a/template/multi-platform-js/proj.android/jni/Android.mk b/template/multi-platform-js/proj.android/jni/Android.mk
index 3b09a62b57..5cd62c3f33 100644
--- a/template/multi-platform-js/proj.android/jni/Android.mk
+++ b/template/multi-platform-js/proj.android/jni/Android.mk
@@ -11,18 +11,11 @@ LOCAL_SRC_FILES := hellojavascript/main.cpp \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
-LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
-LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
 
 LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,cocos2dx)
-$(call import-module,audio/android)
-$(call import-module,scripting/javascript/spidermonkey-android)
+
 $(call import-module,scripting/javascript/bindings)
-$(call import-module,cocos2dx/platform/android)