Bug 857147 - Fixup Android DIST_FILES after bug 648407 and bug 852950. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 08 Apr 2013 08:33:38 +0200
changeset 127959 06e05aaebe7bd7f94e3b86052bcdaf7c5c893ae4
parent 127958 c3361cd2e9678f98971d639a8459f8852d94293b
child 127960 8d1e8c802365cbdfbda2ded56f74a2e005cc33e1
push id24518
push userryanvm@gmail.com
push dateTue, 09 Apr 2013 00:01:18 +0000
treeherderautoland@a7ec1554d481 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs857147, 648407, 852950
milestone23.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 857147 - Fixup Android DIST_FILES after bug 648407 and bug 852950. r=ted
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -255,28 +255,35 @@ endif
 
 DIST_FILES =
 
 # Place the files in the order they are going to be opened by the linker
 ifdef MOZ_CRASHREPORTER
 DIST_FILES += lib.id
 endif
 
+DIST_FILES += libmozalloc.so
+ifndef MOZ_FOLD_LIBS
 DIST_FILES += \
-  libmozalloc.so \
   libnspr4.so \
   libplc4.so \
   libplds4.so \
   libmozsqlite3.so \
   libnssutil3.so \
-  libnss3.so \
+  $(NULL)
+endif
+DIST_FILES += libnss3.so
+ifndef MOZ_FOLD_LIBS
+DIST_FILES += \
   libssl3.so \
   libsmime3.so \
+  $(NULL)
+endif
+DIST_FILES += \
   libxul.so \
-  libxpcom.so \
   libnssckbi.so \
   libfreebl3.so \
   libsoftokn3.so \
   resources.arsc \
   AndroidManifest.xml \
   chrome \
   components \
   defaults \