Bug 1366607: Use correct include path for `plugin-container.cpp`; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Tue, 17 Oct 2017 14:20:04 -0600
changeset 29212 0a70299b8eceb01c72e6445661f8997f288f0bf9
parent 29211 faa8015c6ae3fd293ceb9fb94508ef268f870ef3
child 29213 c6b8fc410a900a22f0d54f5f10934a06ffc8ee6b
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1366607
Bug 1366607: Use correct include path for `plugin-container.cpp`; r=Fallen MozReview-Commit-ID: LkQBfh57LqG
mail/app/moz.build
mail/app/nsMailApp.cpp
--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -5,16 +5,17 @@
 
 DIRS += ['profile']
 
 GeckoProgram(CONFIG['MOZ_APP_NAME'])
 USE_LIBS += ['mozglue']
 SOURCES += ['nsMailApp.cpp']
 LOCAL_INCLUDES += [
     '!/build',
+    '/%s/ipc/contentproc/' % CONFIG['mozreltopsrcdir'],
     '/%s/toolkit/xre' % CONFIG['mozreltopsrcdir'],
     '/%s/xpcom/base' % CONFIG['mozreltopsrcdir'],
     '/%s/xpcom/build' % CONFIG['mozreltopsrcdir'],
 ]
 
 if CONFIG['LIBFUZZER']:
     USE_LIBS += [ 'fuzzer' ]
     LOCAL_INCLUDES += [
--- a/mail/app/nsMailApp.cpp
+++ b/mail/app/nsMailApp.cpp
@@ -84,17 +84,17 @@ SSE2Check()
                    MOZ_ARRAY_LENGTH(sSSE2Message) - 1));
   // _exit() instead of exit() to avoid running the usual "at exit" code.
   _exit(255);
 }
 #endif
 
 #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
 #define MOZ_BROWSER_CAN_BE_CONTENTPROC
-#include "../../mozilla/ipc/contentproc/plugin-container.cpp"
+#include "plugin-container.cpp"
 #endif
 
 using namespace mozilla;
 
 #ifdef XP_MACOSX
 #define kOSXResourcesFolder "Resources"
 #endif
 #define kDesktopFolder ""