Bug 1532695 - Include target.gtest.tests.tar.gz in android builds; r=bc
authorGeoff Brown <gbrown@mozilla.com>
Mon, 08 Apr 2019 22:02:45 +0000
changeset 530324 9eb55c9bf557d9b683d4808620e26da6e242c4b0
parent 530323 707da9fd9d959cd881df8f4899d88b16a2d8635b
child 530325 568de07e5c407730816a421225e782c10478d03f
child 530374 063fb107a6aff7fd4e1acb6089df10e5d22ed4b5
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbc
bugs1532695
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1532695 - Include target.gtest.tests.tar.gz in android builds; r=bc Differential Revision: https://phabricator.services.mozilla.com/D26587
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -315,24 +315,24 @@ 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 Desktop platforms with the exception of Windows PGO, where linking
-# xul-gtest.dll takes too long.
+# on Android 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 == 'browser' and
+    if (automation and build_project in ('browser', 'mobile/android') and
         not (pgo and target.os == 'WINNT')):
         return True
 
 set_config('LINK_GTEST_DURING_COMPILE', build_gtest)
 
 # Localization
 # ==============================================================
 option('--enable-ui-locale', default='en-US',