Bug 1029232 - Part 2: Include rather than reference Fennec Eclipse resources. r=trivial
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -574,17 +574,16 @@ main.filtered_resources += [
'1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/resources/**',
'1.0-projectRelativePath-matches-false-false-*org/mozilla/gecko/tests/**',
]
main.recursive_make_targets += generated_recursive_make_targets
main.recursive_make_targets += ['generated/' + f for f in mgjar.generated_sources]
main.recursive_make_targets += ['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/' + CONFIG['MOZ_APP_NAME'] + '/assets'
main.libs = TOPOBJDIR + '/dist/' + CONFIG['MOZ_APP_NAME'] + '/lib'
main.res = None
cpe = main.add_classpathentry('src', SRCDIR,
dstdir='src/org/mozilla/gecko',
exclude_patterns=['org/mozilla/gecko/tests/**',
@@ -598,18 +597,18 @@ main.add_classpathentry('thirdparty', TO
ignore_warnings=True)
resources = add_android_eclipse_library_project('FennecResources')
resources.package_name = 'org.mozilla.fennec.resources'
resources.res = SRCDIR + '/resources'
resources.included_projects += ['../' + generated.name, '../' + branding.name]
resources.recursive_make_targets += generated_recursive_make_targets
+# The resources are included in the Fennec APK.
main.included_projects += ['../' + resources.name]
-main.referenced_projects += [resources.name]
if CONFIG['MOZ_CRASHREPORTER']:
crashreporter = add_android_eclipse_library_project('FennecResourcesCrashReporter')
crashreporter.package_name = 'org.mozilla.fennec.resources.crashreporter'
crashreporter.res = SRCDIR + '/crashreporter/res'
crashreporter.included_projects += ['../' + resources.name]
main.included_projects += ['../' + crashreporter.name]