Bug 1221724 followup - remove B2G and android references to redit, r=bustage on a CLOSED TREE
authorBenjamin Smedberg <benjamin@smedbergs.us>
Thu, 11 Feb 2016 11:44:33 -0500
changeset 320329 185ca3638874991ea9976f37c62d8a6f2089cd71
parent 320328 2baea255010632af036810ef4592ae63b7be288f
child 320330 5523afd171d80867c4337d13d49c7fc0c07fe719
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1221724
milestone47.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 1221724 followup - remove B2G and android references to redit, r=bustage on a CLOSED TREE
b2g/app/Makefile.in
b2g/moz.build
mobile/android/moz.build
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -56,15 +56,14 @@ tools repackage:: $(libs-preqs)
 else # MOZ_WIDGET_TOOLKIT != cocoa
 
 libs::
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
 # Copy the app icon for b2g-desktop
 ifeq ($(OS_ARCH),WINNT)
 	cp $(DIST)/branding/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico
-	$(DIST)/bin/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(DIST)/branding/$(APP_ICON).ico
 	cp $(DIST)/branding/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/default.ico
 else ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 	cp $(DIST)/branding/default.png $(DIST)/bin/chrome/icons/default/default.png
 endif
 
 endif
--- a/b2g/moz.build
+++ b/b2g/moz.build
@@ -3,15 +3,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += ['chrome', 'components', 'locales']
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += ['../xulrunner/tools/redit']
-
 if CONFIG['GAIADIR']:
     DIRS += ['gaia']
 
 DIRS += ['app']
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -24,15 +24,13 @@ DIRS += [
     'app',
     'fonts',
     'geckoview_library',
 ]
 
 if CONFIG['MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER']:
     DIRS += ['bouncer'] # No ordering implied with respect to base.
 
-DIRS += ['../../xulrunner/tools/redit']
-
 TEST_DIRS += [
     'tests',
 ]
 
 SPHINX_TREES['fennec'] = 'docs'