Bug 1382509 - Part4. Install the pdfium.dll r=jwatt draft
authorFarmer Tseng <fatseng@mozilla.com>
Tue, 22 Aug 2017 14:18:00 +0800
changeset 650297 0358572ffe806be938338f98eafd93dd450fcf5d
parent 650296 b7d04486f58dbd964f878efc5ec9ccc07bfd0f5c
child 727360 d065f43c25a5bf35fb931464f3dec3672c02364d
push id75339
push userbmo:fatseng@mozilla.com
push dateTue, 22 Aug 2017 06:21:28 +0000
reviewersjwatt
bugs1382509
milestone57.0a1
Bug 1382509 - Part4. Install the pdfium.dll r=jwatt MozReview-Commit-ID: D8iT8K16GIN
browser/installer/Makefile.in
browser/installer/package-manifest.in
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -58,16 +58,20 @@ DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
 ifdef MOZ_D3DCOMPILER_VISTA_DLL
 DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
 endif
 endif
 
+ifdef MOZ_ENABLE_SKIA_PDF
+DEFINES += -DMOZ_ENABLE_SKIA_PDF=$(MOZ_ENABLE_SKIA_PDF)
+endif
+
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 # Set MSVC dlls version to package, if any.
 ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
 ifndef MOZ_ARTIFACT_BUILDS
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -601,16 +601,20 @@
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 
 #ifdef MOZ_D3DCOMPILER_VISTA_DLL
 @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
 #endif
 #endif # MOZ_ANGLE_RENDERER
 
+#if defined(XP_WIN) && defined(MOZ_ENABLE_SKIA_PDF)
+@BINPATH@/pdfium.dll
+#endif
+
 ; [Browser Chrome Files]
 @RESPATH@/browser/chrome.manifest
 @RESPATH@/browser/chrome/browser@JAREXT@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/browser/chrome/pdfjs.manifest
 @RESPATH@/browser/chrome/pdfjs/*
 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf