From 3264e348d9fe430dff73138c07de6ed5ac5aec06 Mon Sep 17 00:00:00 2001
From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Mon, 16 Apr 2018 13:47:48 +0000
Subject: [PATCH] Bug 25741 - TBA: Exclude unwanted Stumbler tests

When the stumbler service is ifdef-disabled because MOZ_ANDROID_MLS_STUMBLER
is not defined, then the unit test compilation fails because some values are
never declared and defined. We exclude all testStumbler*.java files from
the robocop gecko test source tree.
---
 mobile/android/app/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 1267f849ee3ad..c6a0bc45d56fa 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -190,6 +190,11 @@ android {
         androidTest {
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src"
+
+                if (!mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
+                    exclude 'org/mozilla/gecko/tests/testStumbler*.java'
+                }
+
                 // Bug 1229149 tracks pushing this into a :services Gradle project.
                 srcDir "${topsrcdir}/mobile/android/services/src/androidTest/java"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"
-- 
GitLab