Bug 1164706 - Flatten docshell/shistory/src/ directory. r=smaug

docshell/base/moz.build

@@ -69,7 +69,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../shistory/src',
+    '/docshell/shistory',
     '/dom/base',
     '/layout/base',
     '/layout/generic',

docshell/build/moz.build

@@ -13,12 +13,12 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../shistory/src/',
+    '/docshell/base',
+    '/docshell/shistory',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
-    ]
+]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
     LOCAL_INCLUDES += ['/uriloader/exthandler/mac']

docshell/shistory/moz.build

@@ -4,8 +4,6 @@
 # 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 += ['src']
-
 XPIDL_SOURCES += [
     'nsIBFCacheEntry.idl',
     'nsISHContainer.idl',
@@ -17,3 +15,22 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'shistory'
+
+EXPORTS += [
+    'nsSHEntryShared.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsSHEntry.cpp',
+    'nsSHEntryShared.cpp',
+    'nsSHistory.cpp',
+    'nsSHTransaction.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
+
+FINAL_LIBRARY = 'xul'

docshell/shistory/src/moz.build

@@ -1,24 +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 += [
-    'nsSHEntryShared.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsSHEntry.cpp',
-    'nsSHEntryShared.cpp',
-    'nsSHistory.cpp',
-    'nsSHTransaction.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
-
-FINAL_LIBRARY = 'xul'