Commit c1edc7ce authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 686805 part 5 - Optionally make libxul.so a seekable compressed stream on Android. r=khuey

parent 942b6613

config/autoconf.mk.in

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ DEHYDRA_PATH = @DEHYDRA_PATH@ 


MOZ_LINKER = @MOZ_LINKER@

MOZ_OLD_LINKER = @MOZ_OLD_LINKER@

MOZ_ENABLE_SZIP = @MOZ_ENABLE_SZIP@

NS_TRACE_MALLOC = @NS_TRACE_MALLOC@

USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@

USE_ELF_HACK = @USE_ELF_HACK@

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -2925,6 +2925,7 @@ ia64*-hpux*) 
esac



AC_SUBST(MOZ_LINKER)

AC_SUBST(MOZ_ENABLE_SZIP)



dnl Only one oddball right now (QNX), but this gives us flexibility

dnl if any other platforms need to override this in the future.

toolkit/mozapps/installer/packager.mk

+9 −1
Original line number Diff line number Diff line
@@ -309,6 +309,12 @@ DIST_FILES += \ 
  recommended-addons.json \

  $(NULL)



ifdef MOZ_ENABLE_SZIP

SZIP_LIBRARIES = \

  libxul.so \

  $(NULL)

endif



NON_DIST_FILES = \

  classes.dex \

  $(NULL)
@@ -354,6 +360,7 @@ endif 


PKG_SUFFIX      = .apk

INNER_MAKE_PACKAGE	= \

  $(foreach lib,$(SZIP_LIBRARIES),host/bin/szip $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib:.so=.sz) && mv $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib:.so=.sz) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) && ) \

  make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \

  cp $(GECKO_APP_AP_PATH)/gecko.ap_ $(_ABS_DIST) && \

  ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
@@ -366,7 +373,8 @@ INNER_MAKE_PACKAGE = \ 
    done && \

    unzip -o $(_ABS_DIST)/gecko.ap_ && \

    rm $(_ABS_DIST)/gecko.ap_ && \

    $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) && \

    $(if $(SZIP_LIBRARIES),$(ZIP) -0 $(_ABS_DIST)/gecko.ap_ $(SZIP_LIBRARIES) && ) \

    $(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \

    $(ZIP) -0 $(_ABS_DIST)/gecko.ap_ $(OMNIJAR_NAME)) && \

  rm -f $(_ABS_DIST)/gecko.apk && \

  $(APKBUILDER) $(_ABS_DIST)/gecko.apk -v $(APKBUILDER_FLAGS) -z $(_ABS_DIST)/gecko.ap_ -f $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \