diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in index 6b5953db94f5..f91bb7ac7f52 100644 --- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -32,15 +32,6 @@ LIBS += \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ $(NULL) -ifeq ($(OS_ARCH),WINNT) -OS_LIBS += $(call EXPAND_LIBNAME,version) -endif - -ifdef _MSC_VER -# Always enter a Windows program through wmain, whether or not we're -# a console application. -WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup -endif endif endif #LIBXUL_SDK @@ -61,10 +52,6 @@ ifdef MOZ_PKG_SPECIAL DEFINES += -DMOZ_PKG_SPECIAL=$(MOZ_PKG_SPECIAL) endif -ifeq ($(OS_ARCH),WINNT) -REDIT_PATH = $(LIBXUL_DIST)/bin -endif - APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX) libs:: @@ -79,8 +66,3 @@ endif endif #} SKIP_COPY_XULRUNNER $(NSINSTALL) -D $(DIST)/bin/chrome/icons/default - -ifeq ($(OS_ARCH),WINNT) - cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico - $(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico -endif diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ba9395bed763..067d59da51ef 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -29,9 +29,6 @@ #endif @BINPATH@/dictionaries/* @BINPATH@/hyphenation/* -#ifdef XP_WIN32 -@BINPATH@/uninstall/helper.exe -#endif [xpcom] @BINPATH@/dependentlibs.list @@ -46,26 +43,6 @@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ -#ifdef XP_WIN32 -#if _MSC_VER == 1400 -@BINPATH@/Microsoft.VC80.CRT.manifest -@BINPATH@/msvcm80.dll -@BINPATH@/msvcp80.dll -@BINPATH@/msvcr80.dll -#elif _MSC_VER == 1500 -@BINPATH@/Microsoft.VC90.CRT.manifest -@BINPATH@/msvcm90.dll -@BINPATH@/msvcp90.dll -@BINPATH@/msvcr90.dll -#elif _MSC_VER == 1600 -@BINPATH@/msvcp100.dll -@BINPATH@/msvcr100.dll -#elif _MSC_VER == 1700 -@BINPATH@/msvcp110.dll -@BINPATH@/msvcr110.dll -#endif - -#endif @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc @@ -86,11 +63,7 @@ #endif @BINPATH@/application.ini @BINPATH@/platform.ini -#ifndef XP_OS2 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ -#else -@BINPATH@/mozsqlt3@DLL_SUFFIX@ -#endif @BINPATH@/blocklist.xml #ifdef XP_UNIX @BINPATH@/run-mozilla.sh @@ -101,10 +74,6 @@ @BINPATH@/components/components.manifest @BINPATH@/components/alerts.xpt #ifdef ACCESSIBILITY -#ifdef XP_WIN32 -@BINPATH@/AccessibleMarshal.dll -@BINPATH@/components/accessibility-msaa.xpt -#endif @BINPATH@/components/accessibility.xpt #endif @BINPATH@/components/appshell.xpt @@ -335,11 +304,7 @@ @BINPATH@/components/nsSessionStore.js @BINPATH@/components/nsURLFormatter.manifest @BINPATH@/components/nsURLFormatter.js -#ifndef XP_OS2 @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ -#else -@BINPATH@/components/brwsrcmp@DLL_SUFFIX@ -#endif @BINPATH@/components/txEXSLTRegExFunctions.manifest @BINPATH@/components/txEXSLTRegExFunctions.js @BINPATH@/components/nsDefaultCLH.manifest @@ -401,14 +366,6 @@ @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ #endif -; ANGLE on Win32 -#ifdef XP_WIN32 -#ifndef HAVE_64BIT_OS -@BINPATH@/libEGL.dll -@BINPATH@/libGLESv2.dll -#endif -#endif - ; [Browser Chrome Files] @BINPATH@/chrome/browser@JAREXT@ @BINPATH@/chrome/browser.manifest @@ -543,11 +500,6 @@ bin/libfreebl_32int64_3.so bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ #endif -; [OS/2] -#ifdef XP_OS2 -@BINPATH@/MozSounds.cmd -#endif - [mobile] @BINPATH@/chrome/icons/ @BINPATH@/chrome/chrome@JAREXT@ diff --git a/mobile/android/installer/removed-files.in b/mobile/android/installer/removed-files.in index 857e7ba81532..25e0af90e22d 100644 --- a/mobile/android/installer/removed-files.in +++ b/mobile/android/installer/removed-files.in @@ -5,29 +5,5 @@ components/CapturePicker.js #if MOZ_UPDATE_CHANNEL != beta extensions/feedback@mobile.mozilla.org.xpi #endif -#ifdef XP_WIN - #if _MSC_VER != 1400 - Microsoft.VC80.CRT.manifest - msvcm80.dll - msvcp80.dll - msvcr80.dll - #endif - #if _MSC_VER != 1500 - Microsoft.VC90.CRT.manifest - msvcm90.dll - msvcp90.dll - msvcr90.dll - #endif - #if _MSC_VER != 1600 - msvcp100.dll - msvcr100.dll - #endif - #if _MSC_VER != 1700 - msvcp110.dll - msvcr110.dll - #endif - mozcrt19.dll - mozcpp19.dll -#endif @DLL_PREFIX@mozutils@DLL_SUFFIX@ jssubloader/