diff options
| -rw-r--r-- | js/src/moz.build | 9 | ||||
| -rw-r--r-- | js/src/proxy/moz.build | 23 |
2 files changed, 8 insertions, 24 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index a46f9a0086..b68732d122 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -110,7 +110,6 @@ DIRS += [ 'irregexp', 'jit', 'perf', - 'proxy', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -144,6 +143,14 @@ SOURCES += [ 'jsscript.cpp', 'jsstr.cpp', 'jsweakmap.cpp', + 'proxy/BaseProxyHandler.cpp', + 'proxy/CrossCompartmentWrapper.cpp', + 'proxy/DeadObjectProxy.cpp', + 'proxy/OpaqueCrossCompartmentWrapper.cpp', + 'proxy/Proxy.cpp', + 'proxy/ScriptedProxyHandler.cpp', + 'proxy/SecurityWrapper.cpp', + 'proxy/Wrapper.cpp', 'threading/Mutex.cpp', 'vm/ArgumentsObject.cpp', 'vm/ArrayBufferObject.cpp', diff --git a/js/src/proxy/moz.build b/js/src/proxy/moz.build deleted file mode 100644 index 72082df858..0000000000 --- a/js/src/proxy/moz.build +++ /dev/null @@ -1,23 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# 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/. - -include('../js-config.mozbuild') -include('../js-cxxflags.mozbuild') - -FINAL_LIBRARY = "js" - -# Includes should be relative to parent path -LOCAL_INCLUDES += ["!..", ".."] - -SOURCES += [ - 'BaseProxyHandler.cpp', - 'CrossCompartmentWrapper.cpp', - 'DeadObjectProxy.cpp', - 'OpaqueCrossCompartmentWrapper.cpp', - 'Proxy.cpp', - 'ScriptedProxyHandler.cpp', - 'SecurityWrapper.cpp', - 'Wrapper.cpp', -] |