From 00d952723a9a2131a7ccbc1a3777c1c1ba0826fc Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 12 Sep 2013 17:42:07 +0200
Subject: [PATCH] Backing out 2a19516ee700 (bug 912908) for causing bug 915536,
 rs=ttaubert over IRC

---
 xpcom/sample/Makefile.in | 9 ---------
 xpcom/sample/moz.build   | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
index a16a1287506..efa358e1d3a 100644
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -10,15 +10,6 @@ SHORT_LIBNAME	= xpcomsmp
 # IS_COMPONENT indicates that this makefile builds a component shared library.
 IS_COMPONENT	= 1
 
-# NOTE:
-####################################################################
-# Variable assignment(s) should be maintained within moz.build files 
-# whenever possible. Migrate existing Makefile.in content into the 
-# corresponding moz.build file, then run 'mach configure' to determine 
-# if the variable is suppported. If not supported / not yet converted- 
-# open a Build::Config bug requesting conversion of the variable.
-####################################################################
-
 # If this is Makefile builds a component, MODULE_NAME must match the module
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule
diff --git a/xpcom/sample/moz.build b/xpcom/sample/moz.build
index cd03dba375e..47e64891fed 100644
--- a/xpcom/sample/moz.build
+++ b/xpcom/sample/moz.build
@@ -27,10 +27,6 @@ EXTRA_COMPONENTS += [
     'nsSample.manifest',
 ]
 
-# FORCE_SHARED_LIB tells the build system that this should be a shared library,
-# even in a static build.
-FORCE_SHARED_LIB = True
-
 # LIBRARY_NAME names the library generated by this makefile,
 # i.e. dist/bin/components/libxpcomsample.so
 LIBRARY_NAME = 'xpcomsample'