diff -r 7e4c4cbd8e5c -r 77a4e6a1beb4 omadrm/drmengine/group/DrmCrypto.mmp
--- a/omadrm/drmengine/group/DrmCrypto.mmp	Tue Mar 02 16:43:46 2010 +0000
+++ b/omadrm/drmengine/group/DrmCrypto.mmp	Mon Mar 08 17:28:28 2010 +0000
@@ -39,14 +39,8 @@
 
 SOURCE          drmaescrypto.cpp
 
-#if 1
-#warning Workaround for Bug 2121
-SOURCEPATH      ../drmcrypto/stub
-SOURCE          CmlaCryptoStub.cpp
-#else
 SOURCEPATH      ../drmcrypto/build
 SOURCE          cmlacrypto.cpp
-#endif
 
 SOURCEPATH      ../drmcrypto/src
 SOURCE          OmaCrypto.cpp