Bug 1256979 - Don't set MOZ_CHROME_FILE_FORMAT to 'flat' for android builds. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Thu, 14 Apr 2016 12:26:38 -0700
changeset 331157 fb9b550b88bf28d2eb6e6c717d91a2b70e3ba921
parent 331156 b6ab9982be5af1c6e5c3d68288880cd105cc6209
child 331158 a6a64a3cb0f35bbef181a4a54bcb54a52ce9bf57
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1256979
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
@@ -6255,17 +6255,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