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.

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

fix(core): Correctly detect Android Tauri configuration file, closes #7785 #7802

Merged
merged 7 commits into from
Sep 12, 2023
Merged

fix(core): Correctly detect Android Tauri configuration file, closes #7785 #7802

merged 7 commits into from
Sep 12, 2023

Conversation

i-c-b
Copy link
Contributor

@i-c-b i-c-b commented Sep 10, 2023

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Docs
  • New Binding issue #___
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change?

Checklist

  • When resolving issues, they are referenced in the PR's title (e.g fix: remove a typo, closes #___, #___)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.
  • I have added a convincing reason for adding this feature, if necessary

Other information

@i-c-b
Copy link
Contributor Author

i-c-b commented Sep 10, 2023

By no means complete, the issue persists. I've tried --target, and the CARGO_BUILD_TARGET environment variable but it seems to do nothing to get the detection to pick up Android instead of Linux. To avoid a major refactor effort, I'd like to get some expert ideas from the core contributors to mobile support.

@amrbashir
Copy link
Member

the TAURI CLI knows what target it will build, so you can just add a parameter to this method or a new method that takes that target and parses it.

@lucasfernog
Copy link
Member

@i-c-b thank you for catching this issue! I pushed a small change to detect the target (using cfg!() macros only pulls the target we used to build the CLI, instead of the target we're compiling, so it needed a breaking change anyway).

@lucasfernog lucasfernog marked this pull request as ready for review September 12, 2023 12:54
@lucasfernog lucasfernog requested a review from a team as a code owner September 12, 2023 12:54
@amrbashir
Copy link
Member

oh boy that's a lot cleaner

@lucasfernog lucasfernog merged commit 100d9ed into tauri-apps:dev Sep 12, 2023
27 checks passed
@i-c-b i-c-b deleted the fix/mobile-tauri-conf-file-name branch September 12, 2023 23:21
lucasfernog added a commit that referenced this pull request Oct 3, 2023
lucasfernog added a commit that referenced this pull request Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🔎 In audit
Development

Successfully merging this pull request may close these issues.

None yet

3 participants