rename from caps/src/DomainPolicy.cpp
rename to caps/DomainPolicy.cpp
rename from caps/include/DomainPolicy.h
rename to caps/DomainPolicy.h
deleted file mode 100644
--- a/caps/idl/moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-XPIDL_SOURCES += [
- 'nsIDomainPolicy.idl',
- 'nsIPrincipal.idl',
- 'nsIScriptSecurityManager.idl',
-]
-
-XPIDL_MODULE = 'caps'
-
deleted file mode 100644
--- a/caps/include/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-EXPORTS += [
- 'nsJSPrincipals.h',
- 'nsNullPrincipal.h',
-]
-
--- a/caps/moz.build
+++ b/caps/moz.build
@@ -1,9 +1,40 @@
# -*- Mode: python; c-basic-offset: 4; 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/.
-DIRS += ['idl', 'include', 'src']
TEST_DIRS += ['tests/mochitest']
+XPIDL_SOURCES += [
+ 'nsIDomainPolicy.idl',
+ 'nsIPrincipal.idl',
+ 'nsIScriptSecurityManager.idl',
+]
+
+XPIDL_MODULE = 'caps'
+
+EXPORTS += [
+ 'nsJSPrincipals.h',
+ 'nsNullPrincipal.h',
+]
+
+UNIFIED_SOURCES += [
+ 'DomainPolicy.cpp',
+ 'nsJSPrincipals.cpp',
+ 'nsNullPrincipal.cpp',
+ 'nsNullPrincipalURI.cpp',
+ 'nsPrincipal.cpp',
+ 'nsScriptSecurityManager.cpp',
+ 'nsSystemPrincipal.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+ '/dom/base',
+ '/js/xpconnect/src',
+]
+
+FINAL_LIBRARY = 'gklayout'
+
rename from caps/idl/nsIDomainPolicy.idl
rename to caps/nsIDomainPolicy.idl
rename from caps/idl/nsIPrincipal.idl
rename to caps/nsIPrincipal.idl
rename from caps/idl/nsIScriptSecurityManager.idl
rename to caps/nsIScriptSecurityManager.idl
rename from caps/src/nsJSPrincipals.cpp
rename to caps/nsJSPrincipals.cpp
rename from caps/include/nsJSPrincipals.h
rename to caps/nsJSPrincipals.h
rename from caps/src/nsNullPrincipal.cpp
rename to caps/nsNullPrincipal.cpp
rename from caps/include/nsNullPrincipal.h
rename to caps/nsNullPrincipal.h
rename from caps/src/nsNullPrincipalURI.cpp
rename to caps/nsNullPrincipalURI.cpp
rename from caps/src/nsNullPrincipalURI.h
rename to caps/nsNullPrincipalURI.h
rename from caps/src/nsPrincipal.cpp
rename to caps/nsPrincipal.cpp
rename from caps/include/nsPrincipal.h
rename to caps/nsPrincipal.h
rename from caps/src/nsScriptSecurityManager.cpp
rename to caps/nsScriptSecurityManager.cpp
rename from caps/include/nsScriptSecurityManager.h
rename to caps/nsScriptSecurityManager.h
rename from caps/src/nsSystemPrincipal.cpp
rename to caps/nsSystemPrincipal.cpp
rename from caps/include/nsSystemPrincipal.h
rename to caps/nsSystemPrincipal.h
deleted file mode 100644
--- a/caps/src/moz.build
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-UNIFIED_SOURCES += [
- 'DomainPolicy.cpp',
- 'nsJSPrincipals.cpp',
- 'nsNullPrincipal.cpp',
- 'nsNullPrincipalURI.cpp',
- 'nsPrincipal.cpp',
- 'nsScriptSecurityManager.cpp',
- 'nsSystemPrincipal.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
- '../include',
- '/dom/base',
- '/js/xpconnect/src',
-]
-
-FINAL_LIBRARY = 'gklayout'
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -214,17 +214,17 @@ EXTRA_JS_MODULES += [
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gklayout'
LOCAL_INCLUDES += [
- '/caps/include',
+ '/caps',
'/content/html/content/src',
'/content/html/document/src',
'/content/svg/content/src',
'/content/xml/content/src',
'/content/xml/document/src',
'/content/xul/content/src',
'/content/xul/document/src',
'/docshell/base',
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -28,16 +28,16 @@ SOURCES += [
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
LOCAL_INCLUDES += [
'../../content/src',
- '/caps/include',
+ '/caps',
'/content/base/src',
'/docshell/base',
'/dom/base',
'/layout/style',
]
FINAL_LIBRARY = 'gklayout'
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -15,17 +15,17 @@ UNIFIED_SOURCES += [
'XMLDocument.cpp',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
LOCAL_INCLUDES += [
- '/caps/include',
+ '/caps',
'/content/base/src',
'/content/html/document/src',
'/content/xul/content/src',
'/dom/base',
'/layout/style',
]
FINAL_LIBRARY = 'gklayout'
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -60,17 +60,17 @@ SOURCES += [
]
FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gklayout'
LOCAL_INCLUDES += [
- '/caps/include',
+ '/caps',
'/content/base/src',
'/db/sqlite3/src',
'/dom/base',
'/dom/quota',
'/dom/src/storage',
'/xpcom/build',
]
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -61,14 +61,14 @@ if CONFIG['MOZ_B2G']:
'MediaPermissionGonk.cpp',
]
FAIL_ON_WARNINGS = True
LOCAL_INCLUDES += [
'../base',
'../camera',
- '/caps/include',
+ '/caps',
]
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gklayout'
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -41,11 +41,11 @@ UNIFIED_SOURCES += [
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gklayout'
LOCAL_INCLUDES += [
- '/caps/include',
+ '/caps',
]
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -71,17 +71,17 @@ GENERATED_FILES = [
'dom_quickstubs.h',
]
DEFINES['JS_THREADSAFE'] = True
LOCAL_INCLUDES += [
'../loader',
'../wrappers',
- '/caps/include',
+ '/caps',
'/content/base/public',
'/content/base/src',
'/content/html/content/src',
'/content/html/document/src',
'/content/svg/content/src',
'/dom/base',
'/dom/workers',
'/js/ipc',
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -33,17 +33,17 @@ LOCAL_INCLUDES += [
'../base',
'../forms',
'../generic',
'../inspector',
'../mathml',
'../style',
'../tables',
'../xul',
- '/caps/include',
+ '/caps',
'/content/base/src',
'/content/canvas/src',
'/content/html/content/src',
'/content/html/document/src',
'/content/svg/content/src',
'/content/xul/content/src',
'/content/xul/document/src',
'/content/xul/templates/src',
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -49,16 +49,16 @@ UNIFIED_SOURCES += [
'ThreadStackHelper.cpp',
'TimerThread.cpp',
]
MSVC_ENABLE_PGO = True
LOCAL_INCLUDES += [
'../build',
- '/caps/include',
+ '/caps',
]
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xpcom_core'
include('/ipc/chromium/chromium-config.mozbuild')