back out 3316ffe2a75a. r=a=bustage
authorAki Sasaki <asasaki@mozilla.com>
Fri, 18 Apr 2014 11:07:33 -0700
changeset 191971 5bbac3fecc7eefe0a28758503b0e372234a97023
parent 191970 a184fee9caad11cacd0df4280406f19411a7a05e
child 191972 ad9954dc140c1f384bef5fd3f4416bc600cf15ed
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersa
milestone30.0a2
backs out3316ffe2a75af3795b7b756901fc66e17536784e
back out 3316ffe2a75a. r=a=bustage
b2g/build.mk
b2g/config/mozconfigs/linux32_gecko/nightly
b2g/config/mozconfigs/linux64_gecko/nightly
b2g/config/mozconfigs/macosx64_gecko/nightly
b2g/installer/Makefile.in
--- a/b2g/build.mk
+++ b/b2g/build.mk
@@ -4,16 +4,19 @@
 
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 installer: 
 	@$(MAKE) -C b2g/installer installer
 
 package:
 	@$(MAKE) -C b2g/installer
+ifdef FXOS_SIMULATOR
+	$(PYTHON) $(srcdir)/b2g/simulator/build_xpi.py $(MOZ_PKG_PLATFORM)
+endif
 
 install::
 	@echo 'B2G can't be installed directly.'
 	@exit 1
 
 upload::
 	@$(MAKE) -C b2g/installer upload
 
--- a/b2g/config/mozconfigs/linux32_gecko/nightly
+++ b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -27,12 +27,9 @@ export MOZ_TELEMETRY_REPORTING=1
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
-# Build simulator xpi and phone tweaks for b2g-desktop
-FXOS_SIMULATOR=1
-
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/mozconfigs/linux64_gecko/nightly
+++ b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -27,12 +27,9 @@ export MOZ_TELEMETRY_REPORTING=1
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
-# Build simulator xpi and phone tweaks for b2g-desktop
-FXOS_SIMULATOR=1
-
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/config/mozconfigs/macosx64_gecko/nightly
+++ b/b2g/config/mozconfigs/macosx64_gecko/nightly
@@ -22,12 +22,9 @@ ac_add_options --enable-application=b2g
 ac_add_options --enable-debug-symbols
 . "$topsrcdir/build/mozconfig.cache"
 ENABLE_MARIONETTE=1
 
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
 
-# Build simulator xpi and phone tweaks for b2g-desktop
-FXOS_SIMULATOR=1
-
 . "$topsrcdir/b2g/config/mozconfigs/common.override"
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -67,20 +67,8 @@ ifdef MOZ_CHROME_MULTILOCALE
 	do \
 	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
 	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
-
-ifdef FXOS_SIMULATOR
-.PHONY: simulator
-simulator: make-package
-	@echo 'Building simulator addon...'
-	$(PYTHON) $(topsrcdir)/b2g/simulator/build_xpi.py $(MOZ_PKG_PLATFORM)
-
-default:: simulator
-
-# Ensure copying Simulator xpi to ftp
-UPLOAD_EXTRA_FILES += fxos-simulator-*-*.xpi
-endif