From 6b2787121c395c499a7514bc508affd71a570d46 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Wed, 12 Jul 2017 17:13:01 -0700 Subject: [PATCH] remove extraneous `using namespace android` and deprecate utils/Log.h This namespace is not used by this file and its declaration is removed in a separate CL from utils/Log.h, which is the only place it is defined, so we must remove this extraneous line. Also, since that separate CL is deprecating utils/Log.h in favor of log/log.h, we make the switch to the new header. Test: Build Change-Id: Iac4bc8faffbd2d68dc4ccccaf569db0c5a13a7bc --- libwvdrmengine/mediadrm/src_hidl/WVGenericCryptoInterface.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libwvdrmengine/mediadrm/src_hidl/WVGenericCryptoInterface.cpp b/libwvdrmengine/mediadrm/src_hidl/WVGenericCryptoInterface.cpp index 67855808..e8d7b6f4 100644 --- a/libwvdrmengine/mediadrm/src_hidl/WVGenericCryptoInterface.cpp +++ b/libwvdrmengine/mediadrm/src_hidl/WVGenericCryptoInterface.cpp @@ -4,7 +4,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "WVCdm" -#include +#include #include "WVGenericCryptoInterface.h" @@ -12,7 +12,6 @@ namespace wvdrm { -using namespace android; using namespace std; using namespace wvcdm;