Detect the Android app module by basename in apps:init

[Zuhef]

Summary

findIntelligentPathForAndroid decides whether the user is already inside the Android app module by testing the first segment of the path, when the intent — stated in its own docstring — is the last one:

const paths = appDir.split("/");
// For when app/build.gradle is found
if (paths[0] === "app") {
  return appDir;
}

For any realistic input the first segment is not app: it's android for android/app, and "" for an absolute path like /home/me/proj/android/app. The branch therefore never runs, and correctness falls through to the src heuristic below it.

Root cause

Because the early return never fires, an app module that has no src directory reaches the fallback that appends app a second time, and getSdkOutputPath writes google-services.json into a directory that does not exist:

appDir	expected	before
android/app (has src/)	android/app	android/app — but via the src check, not the intended branch
android/app (no src/)	android/app	android/app/app

split("/") is also separator-dependent, so the check can never match on Windows, where appDir arrives with \ from path.join.

Fix

Use path.basename(appDir) === "app", which expresses the documented intent directly and is correct for relative paths, absolute paths, trailing separators, and both path separators. Behaviour for the existing cases is unchanged — android/app with a src/ directory still returns android/app, just through the branch that was meant to handle it.

Testing

Added the regression case to the existing getAndroidPlatform table. It fails before this change:

1 failing
  Inside app folder without a src directory:
  AssertionError: expected 'android\app\app' to equal 'android/app'

and passes after it.

$ npx mocha "src/management/apps.spec.ts"
46 passing

$ npx mocha "src/management/*.spec.ts"
97 passing

$ npm run test:compile
(clean)

npx eslint and npx prettier --check are clean on both changed files.

One extra thing, same lines of code

Three assertions in apps.spec.ts hardcoded forward slashes while the implementation builds those values with path.join, so apps.spec.ts was red on a Windows checkout before this PR — 42 passing, 3 failing:

AssertionError: expected 'android\app' to equal 'android/app'
AssertionError: expected 'ios\abc' to equal 'ios/abc'

node-test.yml runs unit tests on ubuntu-latest and macos-latest only (Windows is integration-only), so CI never showed this. I switched those three expectations to path.join(...), which is a no-op on Linux and macOS and makes the suite pass on Windows. The two cases where the function returns appDir verbatim keep their literal values, since that string is echoed back unchanged. Happy to split this into its own PR if you'd rather keep the fix isolated.

Fixes #10863

[google-cla]

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

[gemini-code-assist]

Code Review

This pull request fixes an issue where apps:init writes google-services.json to an incorrect app/app path when the Android module lacks a src directory. This is resolved by using path.basename(appDir) instead of splitting the path string to detect the module directory. Additionally, unit tests in src/management/apps.spec.ts have been updated to use platform-independent path joining and a new test case has been added to cover this scenario. There are no review comments, so I have no feedback to provide.

[Zuhef]

@googlebot I signed it!

[joehan]

Thanks for the contirbution!

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (main@3fc2d76). Learn more about missing BASE report.

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #10864   +/-   ##
=======================================
  Coverage        ?   58.64%           
=======================================
  Files           ?      621           
  Lines           ?    40731           
  Branches        ?     8280           
=======================================
  Hits            ?    23888           
  Misses          ?    14853           
  Partials        ?     1990           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.