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

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

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

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.

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