Bug 1256979 - Don't set MOZ_CHROME_FILE_FORMAT to 'flat' for android builds. r=glandium draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 12 Apr 2016 17:53:18 -0700
changeset 350439 f5d46b215e692f17afad74e68eda8e4f37434817
parent 349863 49d7fb650c9dde7cf6e4b2c7aa578a4a11e83f83
child 350440 824df56278f64d60507b241bb61b7be6649a7436
push id15348
push usercmanchester@mozilla.com
push dateWed, 13 Apr 2016 19:11:58 +0000
reviewersglandium
bugs1256979
milestone48.0a1
Bug 1256979 - Don't set MOZ_CHROME_FILE_FORMAT to 'flat' for android builds. r=glandium MozReview-Commit-ID: 1mpsVLoaCtL
old-configure.in
--- 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