From 3146ba60c556dbb3663293fbecdd5ab0e68edc81 Mon Sep 17 00:00:00 2001 From: Arnold <397136899@qq.com> Date: Fri, 10 May 2019 17:00:46 +0800 Subject: [PATCH] rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* --- ...ib_Cocos2dxLuaJavaBridge.cpp => Cocos2dxLuaJavaBridge.cpp} | 2 +- ...dx_lib_Cocos2dxLuaJavaBridge.h => Cocos2dxLuaJavaBridge.h} | 0 cocos/scripting/lua-bindings/proj.android/Android.mk | 2 +- cocos/scripting/lua-bindings/proj.android/CMakeLists.txt | 2 +- templates/cocos2dx_files.json | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename cocos/scripting/lua-bindings/manual/platform/android/jni/{Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp => Cocos2dxLuaJavaBridge.cpp} (96%) rename cocos/scripting/lua-bindings/manual/platform/android/jni/{Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h => Cocos2dxLuaJavaBridge.h} (100%) diff --git a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp similarity index 96% rename from cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp rename to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp index 1e936ac860f1..4050cc1f1ce4 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h" #include diff --git a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h rename to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk index 2ef2b81e1d4f..06ad2fad43d7 100644 --- a/cocos/scripting/lua-bindings/proj.android/Android.mk +++ b/cocos/scripting/lua-bindings/proj.android/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_FILENAME := libluaccandroid LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \ - ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp + ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../manual \ diff --git a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt index 5206af046cdf..19560eb8f8be 100644 --- a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt @@ -7,7 +7,7 @@ project(${target_name}) set(${target_name}_src ../manual/platform/android/CCLuaJavaBridge.cpp - ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp + ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp ) add_library(${target_name} STATIC diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index e04e2205e7f9..78ea0532b957 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -5517,8 +5517,8 @@ "cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.h", "cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp", "cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h", - "cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp", - "cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h", + "cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp", + "cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h", "cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h", "cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm", "cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp",