Bug 1256979 - Don't set MOZ_CHROME_FILE_FORMAT to 'flat' for android builds. r=glandium
MozReview-Commit-ID: 1mpsVLoaCtL
--- a/old-configure.in
+++ b/old-configure.in
@@ -6272,17 +6272,17 @@ dnl things were flat packaged. After pac
dnl are loaded from a single jar. MOZ_CHROME_FILE_FORMAT
dnl is set to flat since putting files into jars is only
dnl done during packaging with omnijar.
if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then
MOZ_OMNIJAR=1
AC_DEFINE(MOZ_OMNIJAR)
fi
MOZ_PACKAGER_FORMAT="$MOZ_CHROME_FILE_FORMAT"
-if test "$OS_ARCH" = "WINNT" -o "$MOZ_WIDGET_TOOLKIT" = "android"; then
+if test "$OS_ARCH" = "WINNT"; then
MOZ_CHROME_FILE_FORMAT=flat
else
MOZ_CHROME_FILE_FORMAT=symlink
fi
if test "$MOZ_WIDGET_TOOLKIT" = "android"; then
dnl Fennec's static resources live in the assets/ folder of the
dnl APK. Adding a path to the name here works because we only