Bug 773050 - Build services.jar to consume in gecko-browser.jar. r=rnewman

--HG--
extra : commitid : HgwjXppO1Ac
extra : rebase_source : fc82bf82ae2464ac02dcd751a214e8a0a950385b

mobile/android/base/Makefile.in

@@ -127,6 +127,7 @@ ALL_JARS = \
   gecko-mozglue.jar \
   gecko-thirdparty.jar \
   gecko-util.jar \
+  services.jar \
   sync-thirdparty.jar \
   ../javaaddons/javaaddons-1.0.jar \
   $(NULL)

mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java

@@ -475,6 +475,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
       createAddonsEnvironmentsView(db);
     }
 
+    @SuppressWarnings("fallthrough")    
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
       if (oldVersion >= newVersion) {

mobile/android/base/background/healthreport/HealthReportGenerator.java

@@ -456,6 +456,7 @@ public class HealthReportGenerator {
     return !a.equals(b);
   }
 
+  @SuppressWarnings("fallthrough")    
   private static JSONObject getAppInfo(Environment e, Environment current) throws JSONException {
     JSONObject appinfo = new JSONObject();
 

mobile/android/base/moz.build

@@ -139,6 +139,21 @@ stjar = add_java_jar('sync-thirdparty')
 stjar.sources += [ thirdparty_source_dir + f for f in sync_thirdparty_java_files ]
 stjar.javac_flags = ['-Xlint:none']
 
+services_jar = add_java_jar('services')
+services_jar.sources += sync_java_files
+services_jar.extra_jars = [
+    CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
+    CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
+    CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
+    'constants.jar',
+    'gecko-R.jar',
+    'gecko-mozglue.jar',
+    'gecko-thirdparty.jar',
+    'gecko-util.jar',
+    'sync-thirdparty.jar',
+]
+services_jar.javac_flags += ['-Xlint:all,-deprecation']
+
 if CONFIG['MOZ_WEBRTC']:
     video_root = TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/'
     video_render_root = TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/'
@@ -648,7 +663,6 @@ if max_sdk_version >= 11:
 if CONFIG['MOZ_ANDROID_READING_LIST_SERVICE']:
     gbjar.sources += reading_list_service_java_files
 
-gbjar.sources += sync_java_files
 gbjar.extra_jars += [
     OBJDIR + '/../javaaddons/javaaddons-1.0.jar',
     'gecko-R.jar',
@@ -656,6 +670,7 @@ gbjar.extra_jars += [
     'gecko-thirdparty.jar',
     'gecko-util.jar',
     'sync-thirdparty.jar',
+    'services.jar',
 ]
 
 moz_native_devices_jars = [

mobile/android/tests/background/junit3/moz.build

@@ -22,6 +22,7 @@ jar.extra_jars += [
     TOPOBJDIR + '/mobile/android/base/gecko-mozglue.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-thirdparty.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-util.jar',
+    TOPOBJDIR + '/mobile/android/base/services.jar',
     TOPOBJDIR + '/mobile/android/base/sync-thirdparty.jar',
 ]
 

mobile/android/tests/browser/junit3/moz.build

@@ -37,6 +37,7 @@ jar.extra_jars += [
     TOPOBJDIR + '/mobile/android/base/gecko-mozglue.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-thirdparty.jar',
     TOPOBJDIR + '/mobile/android/base/gecko-util.jar',
+    TOPOBJDIR + '/mobile/android/base/services.jar',
     TOPOBJDIR + '/mobile/android/base/sync-thirdparty.jar',
 ]