Merge pull request #4929 from samuele3hu/developNewUI

Fix:Resolve the lua android template errors

template/multi-platform-lua/proj.android/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <application android:label="@string/app_name"
                  android:icon="@drawable/icon">
 
-        <activity android:name=".Cocos2dxActivity"
+        <activity android:name="org.cocos2dx.lua.Cocos2dxActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

template/multi-platform-lua/proj.android/jni/Android.mk

@@ -1,4 +1,3 @@
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -11,9 +10,8 @@ LOCAL_SRC_FILES := hellolua/main.cpp \
                    ../../Classes/AppDelegate.cpp
 
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_STATIC_LIBRARIES := curl_static_prebuilt
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
+                    $(LOCAL_PATH)/../../cocos2d/external/lua/tolua
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
 

template/multi-platform-lua/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java

@@ -1,4 +1,4 @@
-package org.cocos2dx.hellolua;
+package org.cocos2dx.lua;
 
 import android.app.NativeActivity;
 import android.os.Bundle;

tools/project-creator/config-create/config.gitingore

@@ -5,7 +5,6 @@
 # Ignore thumbnails created by windows
 Thumbs.db
 .git
-.gitignore
 
 # ignore copy files
 /lib

tools/project-creator/module/cocos_files.json.REMOVED.git-id

@@ -1 +1 @@
-96eb4f261ce2c1be3899e53508952d57bbd19d5d
+83d4ef65b31281ef8759505d8f90b3172b99992b