am 62e455e6: Merge "Fix WV CryptoPlugin exports invalid entrypoint" into jb-dev

* commit '62e455e6f2a04fddc09027a25837df5c72869cf5': Fix WV CryptoPlugin exports invalid entrypoint
2012-05-05 23:14:24 -07:00
parent 905db3c493 62e455e6f2
commit 31906d8b50
1 changed files with 3 additions and 3 deletions
--- a/proprietary/cryptoPlugin/WVCryptoPlugin.cpp
+++ b/proprietary/cryptoPlugin/WVCryptoPlugin.cpp
@@ -27,12 +27,12 @@

 #include <string.h>

-namespace android {
-
-CryptoFactory *createCryptoFactory() {
+android::CryptoFactory *createCryptoFactory() {
    return new android::WVCryptoFactory;
 }

+namespace android {
+
 // static
 const uint8_t WVCryptoFactory::kUUIDWidevine[16] = {
    0xED,0xEF,0x8B,0xA9,0x79,0xD6,0x4A,0xCE,