Skip to content

Rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* #19694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2019
Merged

Rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* #19694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rg_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp → ...orm/android/jni/Cocos2dxLuaJavaBridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <android/log.h>

Expand Down
0 ..._org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h → ...tform/android/jni/Cocos2dxLuaJavaBridge.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cocos/scripting/lua-bindings/proj.android/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion cocos/scripting/lua-bindings/proj.android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/cocos2dx_files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down