Skip to content

Don't substitute netsim and secure_env by default - #3437

Open
Databean wants to merge 1 commit into
google:mainfrom
Databean:no_substitute_netsim_secure_env
Open

Databean wants to merge 1 commit into
google:mainfrom
Databean:no_substitute_netsim_secure_env

Conversation

@Databean

@Databean Databean commented Oct 27, 2026 •

Copy link
Copy Markdown
Member

These were removed from being packaged on v1.57. This change instead removes it from being substituted, but only from the --host_substitution=all flow, to preserve the --host_substitution=only end-to-end test.

Bug: b/554100008

These were removed from being packaged on v1.57. This change instead
removes it from being substituted, but only from the
`--host_substitution=all` flow, to preserve the
`--host_substitution=only` end-to-end test.

Bug: b/554100008
@Databean
Databean force-pushed the no_substitute_netsim_secure_env branch from 63ba116 to 780c662 Compare October 27, 2026 01:01
@Databean
Databean requested a review from rmuthiah October 27, 2026 08:58
// TODO(schuffelen): actually substitute things when migrations are complete
if (StringFromEnv("CVD_FORCE_SUBSTITUTE").value_or("") != "true") {
std::string base = android::base::Basename(full_link_name);
if (base == "netsim" || base == "netsimd" || base == "secure_env") {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we also want to include crosvm here per our last discussion?

If I recall correctly, crosvm didn't substitute cleanly and made snapshotting unreliable if it was.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still included in the latest release attempt, removing it from the substitution list was the fallback option. The snapshotting issues seem to be fixed with the latest changes.

@Databean
Databean requested a review from rmuthiah October 28, 2026 04:22
@Databean
Databean enabled auto-merge October 28, 2026 19:05

This branch has not been deployed

No deployments
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.

2 participants