Fix Android command line tools

[davidmfinol]

Changes

• Fix Android command line tools

Checklist

• Read the contribution guide and accept the code of conduct
• Readme (updated or not needed)

Summary by CodeRabbit

• Bug Fixes
  • Corrected a spelling error in configuration text.
  • Added an intermediate value and fallback logic to reliably resolve the command-line tools path.
  • Improved robustness so tools are located even when expected metadata is missing, reducing configuration failures.

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

Introduces an intermediate variable ESCAPED_CMDLINE_TOOLS_PATH derived from RAW_CMDLINE_TOOLS_PATH and uses it as a fallback to set ANDROID_CMDLINE_TOOLS_PATH when the primary modules.json-derived value is absent; also fixes a comment typo ("invaild" → "invalid").

Changes

Cohort / File(s)	Summary
Android command-line tools path handling images/ubuntu/editor/Dockerfile	Added ESCAPED_CMDLINE_TOOLS_PATH intermediate variable derived from RAW_CMDLINE_TOOLS_PATH; use it as a fallback when modules.json lacks the expected field to set ANDROID_CMDLINE_TOOLS_PATH. Fixed comment typo ("invaild" → "invalid"). Applied in android-2019+ and 2019+ sections.

Sequence Diagram(s)

sequenceDiagram
  participant Dockerfile
  participant modules.json
  participant RAW_VAR as RAW_CMDLINE_TOOLS_PATH
  participant ESCAPED_VAR as ESCAPED_CMDLINE_TOOLS_PATH
  participant ANDROID_VAR as ANDROID_CMDLINE_TOOLS_PATH
  participant DEFAULT as default path (/cmdline-tools/latest)

  rect rgb(235,240,255)
    Dockerfile->>modules.json: read cmdline-tools.path field
    modules.json-->>Dockerfile: value? (may be empty)
  end

  rect rgb(235,255,240)
    Dockerfile->>RAW_VAR: set from modules.json value
    RAW_VAR->>ESCAPED_VAR: escape/transform RAW value
    ESCAPED_VAR-->>ANDROID_VAR: set if non-empty
    alt ESCAPED empty
      DEFAULT-->>ANDROID_VAR: use default `/cmdline-tools/latest`
    end
  end

  note right of ANDROID_VAR: Resulting path used for Android tooling setup

Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

• Check both android-2019+ and 2019+ sections for consistent behavior.
• Verify escaping logic correctly handles edge cases and preserves intended paths.
• Confirm comment correction only and no other unintended edits.

Possibly related PRs

• fix: "No sdkmanager found" in 6000.x Android #263 — Modifies Android SDK path resolution in the same images/ubuntu/editor/Dockerfile; adds fallbacks when modules.json entries are missing and changes SDK/tools installation sources.

Poem

🐰 I nudged a typo, smoothed a path unseen,
Escaped a value, kept the tools between.
When modules hide, a fallback holds tight,
Quiet fixes hop through the night. 🥕✨

Pre-merge checks and finishing touches

❌ Failed checks (1 warning, 1 inconclusive)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	You can run @coderabbitai generate docstrings to improve docstring coverage.
Description Check	❓ Inconclusive	The PR description follows the required template structure with both the "Changes" and "Checklist" sections present, and all checklist items are appropriately checked. However, the "Changes" section is overly generic, essentially restating the title as "Fix Android command line tools" without explaining the specific modifications made, such as the spelling correction, the introduction of the ESCAPED_CMDLINE_TOOLS_PATH variable, or the fallback mechanism for missing paths. While the template structure is satisfied, the content lacks substantive detail about what was actually changed.	Consider expanding the "Changes" section to provide meaningful details about the modifications, such as specifying the spelling error fix, describing the new path escaping variable and fallback mechanism, and noting the affected sections (android-2019+ and 2019+ sections). This would make the description more informative for future reference and code review clarity.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Title Check	✅ Passed	The PR title "Fix Android command line tools" directly relates to the main change in the changeset, which introduces improved Android command-line tools path handling through a new escaped variable and fallback mechanism. The title is concise, clear, and specific enough that a teammate scanning the history would understand the primary change is about fixing Android command-line tools functionality. It accurately captures the essence of the modifications without being vague or misleading.

---

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 67cdb36 and a07ceb2.

📒 Files selected for processing (1)

• images/ubuntu/editor/Dockerfile (2 hunks)

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]