Skip to content
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

Jump to bottom

fix: Make paths in the CmakeLists scripts Windows friendly #1734

Merged
merged 4 commits into from
Nov 4, 2022
Merged

fix: Make paths in the CmakeLists scripts Windows friendly #1734

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6552254
Fixing the paths to be windows friendly
mganandraj Nov 1, 2022
3e0a903
Update packages/cli-platform-android/src/config/index.ts
thymikee Nov 4, 2022
1dde377
Update packages/cli-platform-android/src/config/index.ts
thymikee Nov 4, 2022
40819c0
fix: lint
thymikee Nov 4, 2022
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
6 changes: 4 additions & 2 deletions packages/cli-platform-android/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,12 @@ export function dependencyConfig(
const androidMkPath = userConfig.androidMkPath
? path.join(sourceDir, userConfig.androidMkPath)
: path.join(sourceDir, 'build/generated/source/codegen/jni/Android.mk');
const cmakeListsPath = userConfig.cmakeListsPath
let cmakeListsPath = userConfig.cmakeListsPath
? path.join(sourceDir, userConfig.cmakeListsPath)
: path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt');

if(process.platform == "win32") {
thymikee marked this conversation as resolved.
Show resolved Hide resolved
cmakeListsPath = cmakeListsPath.replaceAll("\\", "/")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you do the same for androidMkPath as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi .. Sorry, i missed tracking this PR. The fix may not be required form ndk-build as it can handle the windows file paths i believe .. I will check it out and raise another PR if required.

thymikee marked this conversation as resolved.
Show resolved Hide resolved
}
return {
sourceDir,
packageImportPath,
Expand Down