move embedding/nsEmbedCID.h to docshell/components/browser draft
authorMyk Melez <myk@mykzilla.org>
Mon, 10 Oct 2016 15:11:28 -0700
changeset 423333 9ca5d5f5bad3f022998c16c4f5d05934dbb3b1fd
parent 423332 b9db0bb6a412b19488be2b6b6b26b8a5f929bdd6
child 533434 e63ab12bbbda5977d6c2271cf1e8b0c9120933c9
push id31882
push userbmo:myk@mykzilla.org
push dateMon, 10 Oct 2016 22:36:26 +0000
milestone52.0a1
move embedding/nsEmbedCID.h to docshell/components/browser MozReview-Commit-ID: 3jvNejeQLmD
docshell/components/browser/moz.build
docshell/components/browser/nsEmbedCID.h
embedding/moz.build
embedding/nsEmbedCID.h
toolkit/toolkit.mozbuild
--- a/docshell/components/browser/moz.build
+++ b/docshell/components/browser/moz.build
@@ -41,8 +41,12 @@ LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/svg',
     '/layout/style',
 ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+EXPORTS += [
+    'nsEmbedCID.h',
+]
rename from embedding/nsEmbedCID.h
rename to docshell/components/browser/nsEmbedCID.h
deleted file mode 100644
--- a/embedding/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- 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/.
-
-EXPORTS += [
-    'nsEmbedCID.h',
-]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -82,17 +82,16 @@ DIRS += [
     '/gfx',
     '/image',
     '/dom',
     '/view',
     '/widget',
     '/editor',
     '/layout',
     '/docshell',
-    '/embedding',
     '/xpfe/appshell'
 ]
 
 # This needs to be built after the gfx/ directory
 # to ensure all dependencies for skia (e.g. mozalloc, xpcom)
 # have been built
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['/other-licenses/skia-npapi']