From 2b3f236792d9f8c01128343e8344c146620ec133 Mon Sep 17 00:00:00 2001
From: zhangbin <zhangbin@cocos2d-x.org>
Date: Tue, 20 May 2014 10:47:27 +0800
Subject: [PATCH 1/2] Support generate release apk with prebuilt libs.

---
 .../cocos-project-template.json               | 38 +++++++++++++++----
 tools/cocos2d-console                         |  2 +-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/templates/lua-template-runtime/cocos-project-template.json b/templates/lua-template-runtime/cocos-project-template.json
index fe0b0c07c0..a6c20e1960 100644
--- a/templates/lua-template-runtime/cocos-project-template.json
+++ b/templates/lua-template-runtime/cocos-project-template.json
@@ -5,13 +5,41 @@
             "runtime/config.json",
             "runtime/version.json"
         ],
+        "append_from_template": {
+            "from": "frameworks/runtime-src/proj.android",
+            "to": "frameworks/runtime-src/proj.android",
+            "exclude": [
+                "bin",
+                "assets"
+            ]
+        },
         "project_replace_project_name": {
             "src_project_name": "HelloLua",
             "files": [
                 "config.json",
-                ".project"]
+                ".project",
+                "frameworks/runtime-src/proj.android/.project",
+                "frameworks/runtime-src/proj.android/AndroidManifest.xml",
+                "frameworks/runtime-src/proj.android/build.xml",
+                "frameworks/runtime-src/proj.android/res/values/strings.xml"
+            ]
         },
         "append_dir": [
+            {
+                "from": "cocos/platform/android/java",
+                "to": "frameworks/cocos2d-x/cocos/platform/android/java"
+            },
+            {
+                "from": "cocos/scripting/lua-bindings/script",
+                "to": "frameworks/cocos2d-x/cocos/scripting/lua-bindings/script"
+            },
+            {
+                "from": "external/lua/luasocket",
+                "to": "frameworks/cocos2d-x/external/lua/luasocket",
+                "include": [
+                    "*.lua"
+                ]
+            },
             {
                 "from": "cocos/scripting/lua-bindings/script",
                 "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources",
@@ -104,9 +132,7 @@
             "from": "frameworks/runtime-src",
             "to": "frameworks/runtime-src",
             "exclude": [
-                "proj.android/bin",
-                "proj.android/assets",
-                "proj.android/libs",
+                "proj.android",
                 "proj.ios_mac/HelloLua.xcodeproj/project.xcworkspace",
                 "proj.ios_mac/HelloLua.xcodeproj/xcuserdata",
                 "proj.win32/Debug.win32",
@@ -139,10 +165,6 @@
                 "frameworks/runtime-src/proj.win32/PROJECT_NAME.sln",
                 "frameworks/runtime-src/proj.win32/main.cpp",
                 "frameworks/runtime-src/proj.win32/Runtime_win32.cpp",
-                "frameworks/runtime-src/proj.android/.project",
-                "frameworks/runtime-src/proj.android/AndroidManifest.xml",
-                "frameworks/runtime-src/proj.android/build.xml",
-                "frameworks/runtime-src/proj.android/res/values/strings.xml",
                 "frameworks/runtime-src/proj.ios_mac/ios/main.m",
                 "frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch",
                 "frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm",
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
index 9f8d41077f..d66f714b4e 160000
--- a/tools/cocos2d-console
+++ b/tools/cocos2d-console
@@ -1 +1 @@
-Subproject commit 9f8d41077f67a81928acaa9bca4fea1c705b9104
+Subproject commit d66f714b4e88199641ea768e107855012652db17

From ccc85ab210081427fcf2633c7695e67cd5c3bf8b Mon Sep 17 00:00:00 2001
From: zhangbin <zhangbin@cocos2d-x.org>
Date: Tue, 20 May 2014 15:03:43 +0800
Subject: [PATCH 2/2] Update the reference of submodule cocos2d-console.

---
 tools/cocos2d-console | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cocos2d-console b/tools/cocos2d-console
index d66f714b4e..edd24a1dcc 160000
--- a/tools/cocos2d-console
+++ b/tools/cocos2d-console
@@ -1 +1 @@
-Subproject commit d66f714b4e88199641ea768e107855012652db17
+Subproject commit edd24a1dcc0d8344038e4d46367c603b2a846ab5