diff --git a/patches/faster-package-multi-locale.patch b/patches/faster-package-multi-locale.patch index 880d1c7..2e7e476 100644 --- a/patches/faster-package-multi-locale.patch +++ b/patches/faster-package-multi-locale.patch @@ -8,13 +8,13 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil nargs="+", required=True, - help='List of locales to package, including "en-US"', -+ help='List of locales to package, excluding "en-US"', ++ help="List of locales to package", ) @CommandArgument( "--verbose", action="store_true", help="Log informative status messages." ) def package_l10n(command_context, verbose=False, locales=[]): -@@ -2484,55 +2484,36 @@ +@@ -2484,55 +2484,33 @@ "export BUILD_BACKENDS=FasterMake,RecursiveMake\n" "in your mozconfig." ) @@ -72,16 +72,13 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil + {"locales": locales}, + "Processing chrome Gecko resources for locales {locales}", + ) -+ command_context.run_process( -+ [ -+ mozpath.join(command_context.topsrcdir, "mach"), -+ "build", -+ " ".join(map(lambda locale: "chrome-{}".format(locale), locales)), -+ ], ++ command_context._run_make( ++ directory=mozpath.join(command_context.topobjdir), ++ target=list(map(lambda locale: "chrome-{}".format(locale), locales)), + append_env=append_env, -+ pass_thru=True, ++ pass_thru=False, ++ print_directory=False, + ensure_exit_code=True, -+ cwd=mozpath.join(command_context.topsrcdir), + ) if command_context.substs["MOZ_BUILD_APP"] == "mobile/android":