From 546ebfc4d45d8d26e8d2adaac61a12881c4dc1f4 Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Tue, 20 Oct 2020 16:26:53 +0800
Subject: [PATCH] Also replace so name for proj.android when new project

---
 templates/cpp-template-default/CMakeLists.txt |  3 +--
 .../cocos-project-template.json               |  6 +++++
 .../proj.android/app/AndroidManifest.xml      |  2 +-
 templates/lua-template-default/CMakeLists.txt |  3 +--
 .../cocos-project-template.json               |  6 +++++
 .../proj.android/app/AndroidManifest.xml      |  2 +-
 .../cocos-project-template.json               |  6 +++++
 .../cocos-project-template.json               |  6 +++++
 .../plugins/plugin_new/project_new.py         | 23 +++++++++++++++++++
 9 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt
index bef3abf9b1..d6e524f8ec 100644
--- a/templates/cpp-template-default/CMakeLists.txt
+++ b/templates/cpp-template-default/CMakeLists.txt
@@ -71,8 +71,7 @@ list(APPEND GAME_HEADER
      )
 
 if(ANDROID)
-    # change APP_NAME to the share library name for Android, it's value depend on AndroidManifest.xml
-    set(APP_NAME MyGame)
+    # the APP_NAME should match on AndroidManifest.xml
     list(APPEND GAME_SOURCE
          proj.android/app/jni/hellocpp/main.cpp
          )
diff --git a/templates/cpp-template-default/cocos-project-template.json b/templates/cpp-template-default/cocos-project-template.json
index 26aa6af06d..9f4382b9de 100644
--- a/templates/cpp-template-default/cocos-project-template.json
+++ b/templates/cpp-template-default/cocos-project-template.json
@@ -24,6 +24,12 @@
                "proj.android/app/AndroidManifest.xml"
             ]
          },
+         "project_replace_so_name": {
+            "src_so_name": "HelloCpp",
+            "files": [
+                "proj.android/app/AndroidManifest.xml"
+            ]
+         },
          "project_replace_mac_bundleid": {
             "src_bundle_id": "org.cocos2dx.hellocpp",
             "files": [
diff --git a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
index 88d0669f15..3e9a77e159 100644
--- a/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
+++ b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml
@@ -14,7 +14,7 @@
         
         <!-- Tell Cocos2dxActivity the name of our .so -->
         <meta-data android:name="android.app.lib_name"
-                   android:value="MyGame" />
+                   android:value="HelloCpp" />
 
         <activity
             android:name="org.cocos2dx.cpp.AppActivity"
diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt
index 70abc2fe9c..0dfeb23963 100644
--- a/templates/lua-template-default/CMakeLists.txt
+++ b/templates/lua-template-default/CMakeLists.txt
@@ -68,8 +68,7 @@ set(GAME_SOURCE ${RUNTIME_SRC_ROOT}/Classes/AppDelegate.cpp)
 # sources need to compile info, include dirs and source files
 
 if(ANDROID)
-    # change APP_NAME to the share library name for Android, it's value depend on AndroidManifest.xml
-    set(APP_NAME cocos2dlua)
+    # the APP_NAME should match on AndroidManifest.xml
     list(APPEND GAME_SOURCE ${RUNTIME_SRC_ROOT}/proj.android/app/jni/hellolua/main.cpp)
 elseif(LINUX)
     list(APPEND GAME_SOURCE ${RUNTIME_SRC_ROOT}/proj.linux/main.cpp)
diff --git a/templates/lua-template-default/cocos-project-template.json b/templates/lua-template-default/cocos-project-template.json
index c906547d82..b0bd21da4a 100644
--- a/templates/lua-template-default/cocos-project-template.json
+++ b/templates/lua-template-default/cocos-project-template.json
@@ -115,6 +115,12 @@
                 "frameworks/runtime-src/proj.android/app/build.gradle",
                 "frameworks/runtime-src/proj.android/app/AndroidManifest.xml"            ]
         },
+        "project_replace_so_name": {
+            "src_so_name": "HelloLua",
+            "files": [
+                "frameworks/runtime-src/proj.android/app/AndroidManifest.xml"
+            ]
+        },
         "project_replace_mac_bundleid": {
             "src_bundle_id": "org.cocos2dx.hellolua",
             "files": [
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml
index 8bcb400f79..e2e24c8d0c 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml
@@ -12,7 +12,7 @@
         
         <!-- Tell Cocos2dxActivity the name of our .so -->
 		<meta-data android:name="android.app.lib_name"
-				   android:value="cocos2dlua" />
+				   android:value="HelloLua" />
 		
         <activity
             android:name="org.cocos2dx.lua.AppActivity"
diff --git a/tools/cocos2d-console/plugins/plugin_generate/bin-templates/cpp-template-default/cocos-project-template.json b/tools/cocos2d-console/plugins/plugin_generate/bin-templates/cpp-template-default/cocos-project-template.json
index ee6547410c..ce4423c0e6 100644
--- a/tools/cocos2d-console/plugins/plugin_generate/bin-templates/cpp-template-default/cocos-project-template.json
+++ b/tools/cocos2d-console/plugins/plugin_generate/bin-templates/cpp-template-default/cocos-project-template.json
@@ -47,6 +47,12 @@
                "proj.android/AndroidManifest.xml"
             ]
          },
+         "project_replace_so_name": {
+            "src_so_name": "HelloCpp",
+            "files": [
+                "proj.android/app/AndroidManifest.xml"
+            ]
+         },
          "project_replace_mac_bundleid": {
             "src_bundle_id": "org.cocos2dx.hellocpp",
             "files": [
diff --git a/tools/cocos2d-console/plugins/plugin_generate/bin-templates/lua-template-runtime/cocos-project-template.json b/tools/cocos2d-console/plugins/plugin_generate/bin-templates/lua-template-runtime/cocos-project-template.json
index 124e6f9e95..723a4adaed 100644
--- a/tools/cocos2d-console/plugins/plugin_generate/bin-templates/lua-template-runtime/cocos-project-template.json
+++ b/tools/cocos2d-console/plugins/plugin_generate/bin-templates/lua-template-runtime/cocos-project-template.json
@@ -80,6 +80,12 @@
                 "frameworks/runtime-src/proj.android/AndroidManifest.xml"
             ]
         },
+        "project_replace_so_name": {
+            "src_so_name": "HelloLua",
+            "files": [
+                "frameworks/runtime-src/proj.android/app/AndroidManifest.xml"
+            ]
+        },
         "project_replace_mac_bundleid": {
             "src_bundle_id": "org.cocos2dx.hellolua",
             "files": [
diff --git a/tools/cocos2d-console/plugins/plugin_new/project_new.py b/tools/cocos2d-console/plugins/plugin_new/project_new.py
index ce67518240..5cc1d118db 100644
--- a/tools/cocos2d-console/plugins/plugin_new/project_new.py
+++ b/tools/cocos2d-console/plugins/plugin_new/project_new.py
@@ -643,6 +643,29 @@ class TPCreator(object):
                 cocos.Logging.warning(MultiLanguage.get_string('NEW_WARNING_FILE_NOT_FOUND_FMT',
                                                                os.path.join(dst_project_dir, dst)))
 
+    def project_replace_so_name(self, v):
+        """ will modify the content of the file
+        """
+        src_so_name = v['src_so_name']
+        dst_so_name = self.project_name
+        if src_so_name == dst_so_name:
+            return
+
+        cocos.Logging.info(MultiLanguage.get_string('NEW_INFO_STEP_REPLACE_SO_FMT',
+                                                    (src_so_name, dst_so_name)))
+        files = v['files']
+        if not dst_so_name:
+            raise cocos.CCPluginError(MultiLanguage.get_string('NEW_ERROR_PKG_NAME_NOT_SPECIFIED'),
+                                      cocos.CCPluginError.ERROR_WRONG_ARGS)
+        for f in files:
+            dst = f.replace("PROJECT_NAME", self.project_name)
+            dstpath = os.path.join(self.project_dir, dst)
+            if os.path.exists(dstpath):
+                replace_string(dstpath, src_so_name, dst_so_name)
+            else:
+                cocos.Logging.warning(MultiLanguage.get_string('NEW_WARNING_FILE_NOT_FOUND_FMT',
+                                                               dstpath))
+
     def project_replace_mac_bundleid(self, v):
         """ will modify the content of the file
         """