Skip to content

Commit 3b1d27e

Browse files
author
Bin Zhang
authored
Merge pull request #398 from natural-law/v3
Keep the ndk module paths without relative path.
2 parents 57848f9 + 18352ab commit 3b1d27e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

plugins/plugin_compile/build_android.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,12 @@ def do_ndk_build(self, ndk_build_param, build_mode, compile_obj):
222222
for cfg_path in self.ndk_module_paths:
223223
if cfg_path.find("${COCOS_X_ROOT}") >= 0:
224224
cocos_root = cocos.check_environment_variable("COCOS_X_ROOT")
225-
module_paths.append(cfg_path.replace("${COCOS_X_ROOT}", cocos_root))
225+
module_paths.append(os.path.normpath(cfg_path.replace("${COCOS_X_ROOT}", cocos_root)))
226226
elif cfg_path.find("${COCOS_FRAMEWORKS}") >= 0:
227227
cocos_frameworks = cocos.check_environment_variable("COCOS_FRAMEWORKS")
228-
module_paths.append(cfg_path.replace("${COCOS_FRAMEWORKS}", cocos_frameworks))
228+
module_paths.append(os.path.normpath(cfg_path.replace("${COCOS_FRAMEWORKS}", cocos_frameworks)))
229229
else:
230-
module_paths.append(os.path.join(self.app_android_root, cfg_path))
230+
module_paths.append(os.path.normpath(os.path.join(self.app_android_root, cfg_path)))
231231

232232
# delete template static and dynamic files
233233
obj_local_dir = os.path.join(ndk_work_dir, "obj", "local")

0 commit comments

Comments
 (0)