Bug 1445025: Part 1 - Move launcher code into browser/app/winlauncher; r=mhowell
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -57,28 +57,29 @@ if CONFIG['ENABLE_GECKODRIVER']:
if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
# Always enter a Windows program through wmain, whether or not we're
# a console application.
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
if CONFIG['OS_ARCH'] == 'WINNT':
RCINCLUDE = 'splash.rc'
DEFINES['MOZ_PHOENIX'] = True
- SOURCES += [
- 'LauncherProcessWin.cpp',
- 'LaunchUnelevated.cpp',
+ DIRS += [
+ 'winlauncher',
+ ]
+ USE_LIBS += [
+ 'winlauncher',
+ ]
+ LOCAL_INCLUDES += [
+ '/browser/app/winlauncher',
]
DELAYLOAD_DLLS += [
'oleaut32.dll',
'ole32.dll',
]
- OS_LIBS += [
- 'oleaut32',
- 'ole32',
- ]
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
# For sandbox includes and the include dependencies those have
LOCAL_INCLUDES += [
'/security/sandbox/chromium',
'/security/sandbox/chromium-shim',
]
rename from browser/app/LaunchUnelevated.cpp
rename to browser/app/winlauncher/LaunchUnelevated.cpp
rename from browser/app/LaunchUnelevated.h
rename to browser/app/winlauncher/LaunchUnelevated.h
rename from browser/app/LauncherProcessWin.cpp
rename to browser/app/winlauncher/LauncherProcessWin.cpp
rename from browser/app/LauncherProcessWin.h
rename to browser/app/winlauncher/LauncherProcessWin.h
rename from browser/app/ProcThreadAttributes.h
rename to browser/app/winlauncher/ProcThreadAttributes.h
new file mode 100644
--- /dev/null
+++ b/browser/app/winlauncher/moz.build
@@ -0,0 +1,22 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+Library('winlauncher')
+
+FORCE_STATIC_LIB = True
+
+UNIFIED_SOURCES += [
+ 'LauncherProcessWin.cpp',
+ 'LaunchUnelevated.cpp',
+]
+
+OS_LIBS += [
+ 'ntdll',
+ 'oleaut32',
+ 'ole32',
+]
+
+DisableStlWrapping()