Bug 1532695 - Include target.gtest.tests.tar.gz in android builds; r=bc draft
authorGeoff Brown <gbrown@mozilla.com>
Sat, 06 Apr 2019 15:45:17 -0600
changeset 1950354 74b574103d5443330511eb184f525f51fe01ea64
parent 1950353 2356f107c2a76b016cda7905a0e5664df89a23bd
child 1950355 4eca98243e4a24f4c9b33a866c80b70fb4d673e2
push id348625
push usergbrown@mozilla.com
push dateMon, 08 Apr 2019 22:27:56 +0000
treeherdertry@4eca98243e4a [default view] [failures only]
reviewersbc
bugs1532695
milestone68.0a1
Bug 1532695 - Include target.gtest.tests.tar.gz in android builds; r=bc Test Plan: Android builds with gtest artifacts demonstrated at https://treeherder.mozilla.org/#/jobs?repo=try&revision=98f02cf38df346b006c6e623c6234c97821c7d86 Reviewers: bc Tags: #secure-revision Bug #: 1532695 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',