1103566 - Consider merging omni.ja in OS X universal builds

Status: RESOLVED INVALID

(Firefox Build System :: General, defect)

Description

[Florian Bender]

To keep this separated from the other bug: 

(In reply to :Gijs Kruitbosch from Bug 1047584 comment #37)
> > > (In reply to :Gijs Kruitbosch from Bug 1047584 comment #16)
> > > > I hate scope creep as much as the next guy... but is there any chance this
> > > > is an opportunity to stop duplicating all of omni.ja between the two sides
> > > > of the universal build and so to reduce the size of our updates, dmgs, and
> > > > .app bundles?
> > > 
> > > […]
> 
> […] I don't know if it makes
> sense to pursue this; it's somewhat likely that it will be a difficult
> change to make, and I don't know if the investment would be worth it
> considering that 32-bit support is basically a dead end. OTOH, we sadly have
> quite a number of 10.6 users still, and AFAIK there are still no concrete
> plans as to when we'll be dropping support.

Are there any numbers for 32bit-only OS X users (i.e. users who cannot run 64bit on their machine and thus cannot be "upgraded")?

Comment 1

[Nick Thomas [:nthomas] (UTC+12)]

What's the problem here ? In a m-c dep build I see this unification happening:

14:56:28     INFO -  OMNIJAR_NAME=omni.ja \
14:56:28     INFO -  	/builds/slave/m-cen-osx64-000000000000000000/build/src/obj-firefox/i386/_virtualenv/bin/python /builds/slave/m-cen-osx64-000000000000000000/build/src/toolkit/mozapps/installer/packager.py -DAB_CD=en-US -DNO_NSPR_10_SUPPORT -DMOZ_APP_NAME=firefox -DPREF_DIR=defaults/preferences -DJAREXT= -DMOZ_CHILD_PROCESS_NAME=plugin-container -DMOZ_SHARED_MOZGLUE=1 -DNECKO_WIFI -DDLL_PREFIX=lib -DDLL_SUFFIX=.dylib -DBIN_SUFFIX= -DDIR_MACOS=Contents/MacOS/ -DDIR_RESOURCES=Contents/Resources/ -DMOZ_FOLD_LIBS=1 -DAPPNAME=Nightly.app -DBINPATH=/Nightly.app/Contents/MacOS -DRESPATH=Nightly.app/Contents/Resources -DAB=en -DMOZ_ICU_VERSION=52 -DMOZ_ICU_DBG_SUFFIX= -DCLANG_CXX \
14:56:28     INFO -  		--format omni \
14:56:28     INFO -  		--removals /builds/slave/m-cen-osx64-000000000000000000/build/src/browser/installer/removed-files.in \
14:56:28     INFO -  		 \
14:56:28     INFO -  		 \
14:56:28     INFO -  		 \
14:56:28     INFO -  		 \
14:56:28     INFO -  		--optimizejars \
14:56:28     INFO -  		--unify /builds/slave/m-cen-osx64-000000000000000000/build/src/obj-firefox/i386/../x86_64/dist \
14:56:28     INFO -  		package-manifest ../../dist ../../dist/universal/firefox \
14:57:00     INFO -  Executing /builds/slave/m-cen-osx64-000000000000000000/build/src/obj-firefox/i386/../x86_64/dist/bin/xpcshell -g /builds/slave/m-cen-osx64-000000000000000000/build/src/obj-firefox/x86_64/dist/Nightly.app/Contents/Resources -a /builds/slave/m-cen-osx64-000000000000000000/build/src/obj-firefox/x86_64/dist/Nightly.app/Contents/Resources -f /builds/slave/m-cen-osx64-000000000000000000/build/src/toolkit/mozapps/installer/precompile_cache.js -e precompile_startupcache("resource://gre/");
....

We end up with three omni.ja files in equivalent nightly build, the same as windows:
  Contents/Resources/browser/omni.ja
  Contents/Resources/omni.ja
  Contents/Resources/webapprt/omni.ja

Comment 2

[Mike Hommey [:glandium]]

There is no duplication of omni.ja files between 32-bits and 64-bits builds. There is duplication during the build, like everything else, but that's de-duplicated during unification.