Bug 1024708 - Part 2: Build stumbler JAR and integrate into Fennec. r=rnewman

mobile/android/base/AndroidManifest.xml.in

@@ -419,6 +419,9 @@
 #include ../services/manifests/SyncAndroidManifest_services.xml.in
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_services.xml.in
+#endif
+#ifdef MOZ_ANDROID_MLS_STUMBLER
+#include ../stumbler/manifests/StumblerManifest_services.xml.in
 #endif
 
     </application>

mobile/android/base/Makefile.in

@@ -97,6 +97,12 @@ ALL_JARS += search-activity.jar
 generated/org/mozilla/search/R.java: .aapt.deps ;
 endif
 
+ifdef MOZ_ANDROID_MLS_STUMBLER
+extra_packages += org.mozilla.mozstumbler
+ALL_JARS += ../stumbler/stumbler.jar
+generated/org/mozilla/mozstumbler/R.java: .aapt.deps ;
+endif
+
 include $(topsrcdir)/config/config.mk
 
 # Note that we're going to set up a dependency directly between embed_android.dex and the java files

mobile/android/moz.build

@@ -9,6 +9,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
 DIRS += [
     '../locales',
     'locales',
+    'stumbler',
     'base',
     'chrome',
     'components',
@@ -20,6 +21,9 @@ DIRS += [
     'extensions',
 ]
 
+if not CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
+    DIRS.remove('stumbler')
+
 if not CONFIG['LIBXUL_SDK']:
     PARALLEL_DIRS += ['../../xulrunner/tools/redit']
 

mobile/android/stumbler/Makefile.in

@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+JAVA_CLASSPATH := $(ANDROID_SDK)/android.jar
+include $(topsrcdir)/config/android-common.mk
+
+libs:: stumbler.jar

mobile/android/stumbler/java/org/mozilla/mozstumbler/PlaceHolder.java

@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.mozstumbler;
+
+/**
+ * Bug 1024708: this class is a place-holder for landing the build integration
+ * of the background stumbler into Fennec.
+ */
+public class PlaceHolder {
+}

mobile/android/stumbler/manifests/StumblerManifest_services.xml.in

@@ -0,0 +1,2 @@
+<!-- Bug 1024708: this fragment is a place-holder for landing the
+     build integration of the background stumbler into Fennec. -->

mobile/android/stumbler/moz.build

@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include('stumbler_sources.mozbuild')
+
+stumbler_jar = add_java_jar('stumbler')
+stumbler_jar.sources += stumbler_sources
+stumbler_jar.extra_jars += [CONFIG['ANDROID_COMPAT_LIB']]
+stumbler_jar.javac_flags += ['-Xlint:all']

mobile/android/stumbler/stumbler_sources.mozbuild

@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+stumbler_sources = [
+    'java/org/mozilla/mozstumbler/PlaceHolder.java',
+]