Bug 1024708 - Part 2: Build stumbler JAR and integrate into Fennec. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Tue, 15 Jul 2014 13:50:21 -0700
changeset 194366 18a81fe5e78b79e9c4ad942e656fca5dc619b0db
parent 194365 bf9c873c60f16cadd842d1bccc50a53c4badd47f
child 194367 298f6155fc60b9ee9e3d94d56c05a7979453611c
push id46330
push usercbook@mozilla.com
push dateWed, 16 Jul 2014 13:59:12 +0000
treeherdermozilla-inbound@f6b084788adb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs1024708
milestone33.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 1024708 - Part 2: Build stumbler JAR and integrate into Fennec. r=rnewman
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/Makefile.in
mobile/android/moz.build
mobile/android/stumbler/Makefile.in
mobile/android/stumbler/java/org/mozilla/mozstumbler/PlaceHolder.java
mobile/android/stumbler/manifests/StumblerManifest_services.xml.in
mobile/android/stumbler/moz.build
mobile/android/stumbler/stumbler_sources.mozbuild
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -415,16 +415,19 @@
 
 #include ../services/manifests/AnnouncementsAndroidManifest_services.xml.in
 #include ../services/manifests/FxAccountAndroidManifest_services.xml.in
 #include ../services/manifests/HealthReportAndroidManifest_services.xml.in
 #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>
 
     <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"
                 android:protectionLevel="signature"/>
 
     <permission android:name="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"
                 android:protectionLevel="signature"/>
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -92,16 +92,22 @@ ALL_JARS += webrtc.jar
 endif
 
 ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 extra_packages += org.mozilla.search
 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
 # Instead of on the .class files, since more than one .class file might be produced per .java file
 # Sync dependencies are provided in a single jar. Sync classes themselves are delivered as source,
 # because Android resource classes must be compiled together in order to avoid overlapping resource
 # indices.
 
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -4,25 +4,29 @@
 # 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/.
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += [
     '../locales',
     'locales',
+    'stumbler',
     'base',
     'chrome',
     'components',
     'modules',
     'themes/core',
     'app',
     'fonts',
     'geckoview_library',
     'extensions',
 ]
 
+if not CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
+    DIRS.remove('stumbler')
+
 if not CONFIG['LIBXUL_SDK']:
     PARALLEL_DIRS += ['../../xulrunner/tools/redit']
 
 TEST_DIRS += [
     'tests',
 ]
new file mode 100644
--- /dev/null
+++ b/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
new file mode 100644
--- /dev/null
+++ b/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 {
+}
new file mode 100644
--- /dev/null
+++ b/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. -->
new file mode 100644
--- /dev/null
+++ b/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']
new file mode 100644
--- /dev/null
+++ b/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',
+]