Skip to content

Package etc/cvd_config in /usr/lib/cuttlefish-common - #2969

Merged
Databean merged 2 commits into
google:mainfrom
Databean:package_cvd_config
Aug 8, 2026
Merged

Package etc/cvd_config in /usr/lib/cuttlefish-common#2969
Databean merged 2 commits into
google:mainfrom
Databean:package_cvd_config

Conversation

@Databean

@Databean Databean commented Aug 4, 2026

Copy link
Copy Markdown
Member

These files are included in cvd-host_package.tar.gz as etc/cvd_config/*. assemble_cvd uses these files. Running in --host_substitution=only mode produces this warning:

/var/tmp/cvd/270178/1785454400023677/artifacts/0/android-info.txt contains invalid config preset: 'phone'.
Config 'phone' not found: 1. config_flag.cpp:83 | ReadConfig | Could not read config file "/var/tmp/cvd/270178/1785454400023677/artifacts/host_tools/etc/cvd_config/cvd_config_phone.json"
 | cuttlefish/common/libs/utils/files.cpp:331
 | Result<std::string> cuttlefish::ReadFileContents(const std::string &)
 v CF_EXPECT(FileExists(filepath))
The file at "/var/tmp/cvd/270178/1785454400023677/artifacts/host_tools/etc/cvd_config/cvd_config_phone.json" does not exist.

These files are based on android17-release on android.googlesource.com, the most recently published version plus ag/41193528 and ag/41193529 which modify config_phone.json.

Bug: b/542721218

@Databean
Databean requested a review from jemoreira August 4, 2026 21:57
@Databean
Databean force-pushed the package_cvd_config branch from 3e16272 to cce136a Compare August 5, 2026 00:09
@Databean Databean added the kokoro:run Run e2e tests. label Aug 5, 2026
@Databean
Databean enabled auto-merge August 5, 2026 00:09
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Aug 5, 2026
@Databean
Databean force-pushed the package_cvd_config branch from cce136a to 94afab6 Compare August 5, 2026 07:17
@Databean Databean added the kokoro:run Run e2e tests. label Aug 5, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed the kokoro:run Run e2e tests. label Aug 5, 2026
@Databean
Databean force-pushed the package_cvd_config branch from 94afab6 to 2f324c0 Compare August 5, 2026 22:03
@Databean

Databean commented Aug 5, 2026

Copy link
Copy Markdown
Member Author

Had to update the e2etests since they make assumptions about the display size of phone devices.

@Databean
Databean added this pull request to the merge queue Aug 5, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 6, 2026
@Databean
Databean force-pushed the package_cvd_config branch from 2f324c0 to 9fe5ed2 Compare August 6, 2026 16:33
@Databean
Databean enabled auto-merge August 6, 2026 16:33
@Databean Databean added kokoro:force-run Trigger a presubmit build unconditionally. kokoro:run Run e2e tests. labels Aug 6, 2026
@GoogleCuttlefishTesterBot GoogleCuttlefishTesterBot removed kokoro:run Run e2e tests. kokoro:force-run Trigger a presubmit build unconditionally. labels Aug 6, 2026
@Databean
Databean force-pushed the package_cvd_config branch from 9fe5ed2 to 7f2a37a Compare August 7, 2026 22:11
@Databean
Databean added this pull request to the merge queue Aug 7, 2026
@Databean
Databean removed this pull request from the merge queue due to a manual request Aug 7, 2026
These files are included in `cvd-host_package.tar.gz` as `etc/cvd_config/*`. `assemble_cvd` uses these files. Running in `--host_substitution=only` mode produces this warning:
```
/var/tmp/cvd/270178/1785454400023677/artifacts/0/android-info.txt contains invalid config preset: 'phone'.
Config 'phone' not found: 1. config_flag.cpp:83 | ReadConfig | Could not read config file "/var/tmp/cvd/270178/1785454400023677/artifacts/host_tools/etc/cvd_config/cvd_config_phone.json"
 | cuttlefish/common/libs/utils/files.cpp:331
 | Result<std::string> cuttlefish::ReadFileContents(const std::string &)
 v CF_EXPECT(FileExists(filepath))
The file at "/var/tmp/cvd/270178/1785454400023677/artifacts/host_tools/etc/cvd_config/cvd_config_phone.json" does not exist.
```

These files are based on android17-release on android.googlesource.com,
the most recently published version plus ag/41193528 and ag/41193529
which modify config_phone.json.

Bug: b/542721218
@Databean
Databean force-pushed the package_cvd_config branch from 7f2a37a to b10143d Compare August 8, 2026 00:23
@Databean
Databean enabled auto-merge August 8, 2026 00:23
@Databean
Databean added this pull request to the merge queue Aug 8, 2026
Merged via the queue into google:main with commit 762bf3a Aug 8, 2026
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants