Commit 09acd57d authored by Daniel Varga's avatar Daniel Varga
Browse files

Backed out 13 changesets (bug 1620744) for causing diffoscope failures... 

Backed out 13 changesets (bug 1620744) for causing diffoscope failures firefox/browser/chrome/browser/content/browser/built_in_addons.json

CLOSED TREE

Backed out changeset 6beda54bcb9b (bug 1620744)
Backed out changeset a1e97f0b91ef (bug 1620744)
Backed out changeset b8faa0184d4f (bug 1620744)
Backed out changeset 3bc8fda68107 (bug 1620744)
Backed out changeset 8e95b21b2ae3 (bug 1620744)
Backed out changeset 1de09de1a802 (bug 1620744)
Backed out changeset 622a2f7414fa (bug 1620744)
Backed out changeset 3372c9ab721c (bug 1620744)
Backed out changeset 0997313a9f99 (bug 1620744)
Backed out changeset 2fa34749bbfa (bug 1620744)
Backed out changeset 6d597d2eb792 (bug 1620744)
Backed out changeset 78e78f7c7b26 (bug 1620744)
Backed out changeset 6e4d85b19f88 (bug 1620744)
parent df858c90

Makefile.in

+4 −4
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ endif 


ifdef MOZ_ANDROID_FAT_AAR_ARCHITECTURES

recurse_android-fat-aar-artifact:

	$(call py3_action,fat_aar,\

	$(call py_action,fat_aar,\

    $(addprefix --armeabi-v7a $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_ARMEABI_V7A)) \

    $(addprefix --arm64-v8a $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_ARM64_V8A)) \

    $(addprefix --x86 $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_X86)) \
@@ -196,14 +196,14 @@ endif 
.PHONY: symbolsfullarchive

symbolsfullarchive: prepsymbolsarchive

	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'

	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \

	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \

                                     $(abspath $(DIST)/crashreporter-symbols) \

                                     --full-archive)



.PHONY: symbolsarchive

symbolsarchive: prepsymbolsarchive

	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip'

	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \

	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \

                                     $(abspath $(DIST)/crashreporter-symbols))



ifdef MOZ_CRASHREPORTER
@@ -229,7 +229,7 @@ update-packaging: 


.PHONY: package-generated-sources

package-generated-sources:

	$(call py3_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')

	$(call py_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')



ifdef JS_STANDALONE

# Delegate js-specific rules to js

browser/app/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ endif 
# steps. See bug 1431342.

libs:: $(srcdir)/profile/channel-prefs.js

	$(NSINSTALL) -D $(DIST)/bin/defaults/pref

	$(call py3_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)

	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)



ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

browser/installer/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ endif 


package-compare::

	cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt

	$(call py3_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt

	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt

	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt

	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt

browser/installer/windows/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ $(CONFIG_DIR)/setup.exe:: 
	$(MKDIR) $(CONFIG_DIR)

	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)

	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)

	$(call py3_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \

	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \

	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)

	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \

	  --preprocess-locale $(topsrcdir) \

build/variables.py

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ def buildid_header(output): 
def get_program_output(*command):

    try:

        with open(os.devnull) as stderr:

            return subprocess.check_output(command, stderr=stderr,

                                           universal_newlines=True)

            return subprocess.check_output(command, stderr=stderr)

    except Exception:

        return ''