Bug 1332639 - Remove the RDF "standalone" library which isn't used, r=glandium

MozReview-Commit-ID: 69CSBBqLrPs

--HG--
rename : rdf/util/nsRDFResource.cpp => rdf/base/nsRDFResource.cpp
rename : rdf/util/nsRDFResource.h => rdf/base/nsRDFResource.h
extra : rebase_source : 5ccb4cec751bf3ebc08365f541ec6dad6d9c0a06

rdf/base/moz.build

@@ -32,6 +32,7 @@ XPIDL_MODULE = 'rdf'
 
 EXPORTS += [
     'nsIRDFContentSink.h',
+    'nsRDFResource.h',
     'rdf.h',
 ]
 
@@ -44,6 +45,7 @@ UNIFIED_SOURCES += [
     'nsRDFContainer.cpp',
     'nsRDFContainerUtils.cpp',
     'nsRDFContentSink.cpp',
+    'nsRDFResource.cpp',
     'nsRDFService.cpp',
     'nsRDFXMLDataSource.cpp',
     'nsRDFXMLParser.cpp',

rdf/moz.build

@@ -4,6 +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 += ['base', 'util', 'datasource', 'build']
+DIRS += ['base', 'datasource', 'build']
 TEST_DIRS += ['tests']
 

rdf/util/internal/moz.build

@@ -1,11 +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/.
-
-include('../objs.mozbuild')
-
-SOURCES += rdf_util_src_cppsrcs
-
-FINAL_LIBRARY = 'xul'

rdf/util/moz.build

@@ -1,26 +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/.
-
-# This file builds the rdfutil_external_s library which should be used
-# by frozen (dependent) linkage components. The internal-linkage code
-# should use rdfutil_s which is built in the internal/ subdirectory.
-
-DIRS += ['internal']
-
-EXPORTS += [
-    'nsRDFResource.h',
-]
-
-include('objs.mozbuild')
-
-SOURCES += rdf_util_src_cppsrcs
-
-Library('rdfutil_external_s')
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = True
-
-DIST_INSTALL = True

rdf/util/objs.mozbuild

@@ -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/.
-
-rdf_util_src_cppsrcs = [
-    '/rdf/util/nsRDFResource.cpp',
-]