Bug 853045 - Part 4: Add Android Eclipse projects to moz.build files. r=gps

build/mobile/robocop/moz.build

@@ -5,3 +5,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
+
+main = add_android_eclipse_project('Robocop', OBJDIR + '/AndroidManifest.xml')
+main.package_name = 'org.mozilla.roboexample.test'
+main.res = SRCDIR + '/res'
+main.recursive_make_targets += [
+    OBJDIR + '/AndroidManifest.xml',
+    TOPOBJDIR + '/mobile/android/base/tests/TestConstants.java']
+main.extra_jars += [SRCDIR + '/robotium-solo-4.3.1.jar']
+main.assets = TOPSRCDIR + '/mobile/android/base/tests/assets'
+main.referenced_projects += ['Fennec']
+
+main.add_classpathentry('harness', SRCDIR,
+    dstdir='harness/org/mozilla/gecko')
+main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
+    dstdir='src/org/mozilla/gecko/tests')
+main.add_classpathentry('generated', TOPOBJDIR + '/mobile/android/base/tests',
+    dstdir='generated/org/mozilla/gecko/tests')

mobile/android/base/moz.build

@@ -485,3 +485,35 @@ if '-march=armv7' in CONFIG['OS_CFLAGS']:
     DEFINES['MOZ_MIN_CPU_VERSION'] = 7
 else:
     DEFINES['MOZ_MIN_CPU_VERSION'] = 5
+
+generated = add_android_eclipse_library_project('FennecGeneratedResources')
+generated.package_name = 'org.mozilla.fennec.generatedresources'
+generated.res = OBJDIR + '/res'
+
+branding = add_android_eclipse_library_project('FennecBrandingResources')
+branding.package_name = 'org.mozilla.fennec.brandingresources'
+branding.res = TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res'
+
+main = add_android_eclipse_project('Fennec', OBJDIR + '/AndroidManifest.xml')
+main.package_name = 'org.mozilla.gecko'
+main.res = SRCDIR + '/resources'
+
+main.recursive_make_targets += ['.aapt.deps'] # Captures dependencies on Android manifest and all resources.
+main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in mgjar.generated_sources]
+main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in gbjar.generated_sources]
+
+main.included_projects += ['../' + generated.name, '../' + branding.name]
+main.extra_jars += [CONFIG['ANDROID_COMPAT_LIB']]
+main.assets = TOPOBJDIR + '/dist/fennec/assets'
+main.libs = TOPOBJDIR + '/dist/fennec/lib'
+
+cpe = main.add_classpathentry('src', SRCDIR,
+    dstdir='src/org/mozilla/gecko',
+    exclude_patterns=['org/mozilla/gecko/tests/**'])
+if not CONFIG['MOZ_CRASHREPORTER']:
+    cpe.exclude_patterns += ['org/mozilla/gecko/CrashReporter.java']
+main.add_classpathentry('generated', OBJDIR + '/generated',
+    dstdir='generated')
+main.add_classpathentry('thirdparty', TOPSRCDIR + '/mobile/android/thirdparty',
+    dstdir='thirdparty',
+    ignore_warnings=True)

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

@@ -5,3 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('android-services.mozbuild')
+
+main = add_android_eclipse_project('BackgroundInstrumentationTests', OBJDIR + '/AndroidManifest.xml')
+main.package_name = 'org.mozilla.background.test'
+main.res = SRCDIR + '/res'
+main.recursive_make_targets += [
+    OBJDIR + '/AndroidManifest.xml',
+    TOPOBJDIR + '/mobile/android/base/tests/TestConstants.java']
+main.referenced_projects += ['Fennec']
+
+main.add_classpathentry('src', SRCDIR + '/src',
+    dstdir='src/org/mozilla/gecko/background')