From 57fdd2a011871ddb11c4c941c0614b3c676517f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 4 Mar 2021 20:35:24 +0000 Subject: [PATCH] Bug 1696437 - Enable non-native theme on Android Nightly. r=mstange Last platform that remains! Will send fixes for the couple failures in a sec. Differential Revision: https://phabricator.services.mozilla.com/D107231 --- modules/libpref/init/StaticPrefList.yaml | 10 +--------- python/mozbuild/mozbuild/mozinfo.py | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 6af13220e43c..4bbd95620797 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -10569,15 +10569,7 @@ # entry in python/mozbuild/mozbuild/mozinfo.py - name: widget.non-native-theme.enabled type: RelaxedAtomicBool -#if defined(XP_LINUX) && defined(NIGHTLY_BUILD) && !defined(ANDROID) - value: true -#elif defined(XP_MACOSX) && defined(NIGHTLY_BUILD) - value: true -#elif defined(XP_WIN) && defined(NIGHTLY_BUILD) - value: true -#else - value: false -#endif + value: @IS_NIGHTLY_BUILD@ mirror: always # The size in CSS pixels at full zoom of the minimum scrollbar width. diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index d15162020b5d..e6b4d214bfa8 100644 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -96,7 +96,7 @@ def build_dict(config, env=os.environ): d["artifact"] = substs.get("MOZ_ARTIFACT_BUILDS") == "1" d["ccov"] = substs.get("MOZ_CODE_COVERAGE") == "1" d["cc_type"] = substs.get("CC_TYPE") - d["non_native_theme"] = d["os"] not in ["android"] and d["nightly_build"] + d["non_native_theme"] = d["nightly_build"] def guess_platform(): if d["buildapp"] == "browser":