Skip to content

Commit

Permalink
Bug 1783959 - Add --profile argument when using custom profile. r=fir…
Browse files Browse the repository at this point in the history
…efox-build-system-reviewers,glandium

This is regression by bug 1581971.

When using custom profile to run GVE via `./mach run --profile <directory>`,
we add "--profile" argument on `adb`. But, after landing bug 1581971, we
don't pass any profile arguments unfortunately.

So we should add it to use custom profile.

Also, This fixes that `./mach run --enable-fission` is broken. We don't need
`--profile` argument to run GVE with fission.

Differential Revision: https://phabricator.services.mozilla.com/D154772
  • Loading branch information
makotokato committed Aug 17, 2022
1 parent 1b53395 commit 32efa4b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/mozbuild/mozbuild/mach_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ def _run_android(
'Using profile from target "{target_profile}"',
)

args = ["--profile", shlex_quote(target_profile)]

# FIXME: When android switches to using Fission by default,
# MOZ_FORCE_DISABLE_FISSION will need to be configured correctly.
if enable_fission:
env.append("MOZ_FORCE_ENABLE_FISSION=1")

args = ["--profile", shlex_quote(target_profile)]

extras = {}
for i, e in enumerate(env):
extras["env{}".format(i)] = e
Expand Down

0 comments on commit 32efa4b

Please sign in to comment.