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

* commit '62e455e6f2a04fddc09027a25837df5c72869cf5':
  Fix WV CryptoPlugin exports invalid entrypoint
This commit is contained in:
Jeff Tinker
2012-05-05 23:14:24 -07:00
committed by Android Git Automerger

View File

@@ -27,12 +27,12 @@
#include <string.h> #include <string.h>
namespace android { android::CryptoFactory *createCryptoFactory() {
CryptoFactory *createCryptoFactory() {
return new android::WVCryptoFactory; return new android::WVCryptoFactory;
} }
namespace android {
// static // static
const uint8_t WVCryptoFactory::kUUIDWidevine[16] = { const uint8_t WVCryptoFactory::kUUIDWidevine[16] = {
0xED,0xEF,0x8B,0xA9,0x79,0xD6,0x4A,0xCE, 0xED,0xEF,0x8B,0xA9,0x79,0xD6,0x4A,0xCE,