Bug 1024708 - Part 3: Eclipse support. r=rnewman

mobile/android/base/moz.build

@@ -650,7 +650,7 @@ for d in ['app', 'chrome', 'components', 'locales', 'modules', 'themes']:
 
 # The omnijar is included in the Fennec APK (although it's empty,
 # having no resources, assets, or Java code).
-main.included_projects += [omnijar.name]
+main.included_projects += ['../' + omnijar.name]
 
 if CONFIG['MOZ_CRASHREPORTER']:
     crashreporter = add_android_eclipse_library_project('FennecResourcesCrashReporter')
@@ -659,3 +659,7 @@ if CONFIG['MOZ_CRASHREPORTER']:
     crashreporter.included_projects += ['../' + resources.name]
 
     main.included_projects += ['../' + crashreporter.name]
+
+if CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
+    main.included_projects += ['../FennecStumbler']
+    main.referenced_projects += ['../FennecStumbler']

mobile/android/stumbler/moz.build

@@ -10,3 +10,9 @@ 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']
+
+stumbler_eclipse = add_android_eclipse_library_project('FennecStumbler')
+stumbler_eclipse.package_name = 'org.mozilla.fennec.stumbler'
+stumbler_eclipse.res = None
+stumbler_eclipse.extra_jars += [CONFIG['ANDROID_COMPAT_LIB']]
+stumbler_eclipse.add_classpathentry('java', SRCDIR + '/java', dstdir='java')