[mq]: gtest-build draft
authorGeoff Brown <gbrown@mozilla.com>
Wed, 10 Apr 2019 09:26:25 -0600
changeset 1952647 34733d042f178ac85da28bcf50922c64eedfd89a
parent 1952535 43c4699b1770e430e57a1b77604d7bbb36936b6b
child 1952648 b8c89ff88713b9aaeae30fb183b2c4af4f1a368c
push id349198
push usergbrown@mozilla.com
push dateWed, 10 Apr 2019 15:27:42 +0000
treeherdertry@b8c89ff88713 [default view] [failures only]
milestone68.0a1
[mq]: gtest-build
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -315,25 +315,25 @@ def check_objdir_backend_reuse(build_env
                     build_env.topobjdir, prev)
 
 
 option('--disable-gtest-in-build',
        help='Force disable building the gtest libxul during the build.',
        when='--enable-compile-environment')
 
 # Determine whether to build the gtest xul. This happens in automation
-# on Android and Desktop platforms with the exception of Windows PGO, where
+# on Android x86_64 and Desktop platforms with the exception of Windows PGO, where
 # linking xul-gtest.dll takes too long.
 @depends('MOZ_PGO', build_project, target, 'MOZ_AUTOMATION', '--disable-gtest-in-build',
          enable_tests, when='--enable-compile-environment')
 def build_gtest(pgo, build_project, target, automation, enabled, enable_tests):
     if not enable_tests or not enabled:
         return None
     if (automation and build_project in ('browser', 'mobile/android') and
-        not (pgo and target.os == 'WINNT')):
+        not ((pgo and target.os == 'WINNT') or (target.os == 'Android' and target.cpu_arch != 'x86_64'))):
         return True
 
 set_config('LINK_GTEST_DURING_COMPILE', build_gtest)
 
 # Localization
 # ==============================================================
 option('--enable-ui-locale', default='en-US',
        help='Select the user interface locale (default: en-US)')