diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-06 12:15:23 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-04-06 15:01:59 -0700 |
| commit | 3eb7df74b8eae5c902039d1b76402350715a0944 (patch) | |
| tree | fef29970dae9d7d81cd8464e6112411bc741f3ce /drm | |
| parent | 4cb19c55b5d336a0cdbc584d8c4b240d1abe8f3e (diff) | |
| download | android_hardware_interfaces-3eb7df74b8eae5c902039d1b76402350715a0944.tar.gz android_hardware_interfaces-3eb7df74b8eae5c902039d1b76402350715a0944.tar.bz2 android_hardware_interfaces-3eb7df74b8eae5c902039d1b76402350715a0944.zip | |
Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h
Test: pass
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.0/default/CryptoFactory.cpp | 2 | ||||
| -rw-r--r-- | drm/1.0/default/CryptoPlugin.cpp | 2 | ||||
| -rw-r--r-- | drm/1.0/default/DrmFactory.cpp | 2 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_clearkey_test.cpp | 2 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 2 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/vendor_modules.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drm/1.0/default/CryptoFactory.cpp b/drm/1.0/default/CryptoFactory.cpp index 935786ddf..caab83bc0 100644 --- a/drm/1.0/default/CryptoFactory.cpp +++ b/drm/1.0/default/CryptoFactory.cpp @@ -16,10 +16,10 @@ #define LOG_TAG "android.hardware.drm@1.0-impl" #include "CryptoFactory.h" +#include <log/log.h> #include "CryptoPlugin.h" #include "LegacyPluginPath.h" #include "TypeConvert.h" -#include <utils/Log.h> namespace android { namespace hardware { diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp index 9c51b15d1..bf7ac733e 100644 --- a/drm/1.0/default/CryptoPlugin.cpp +++ b/drm/1.0/default/CryptoPlugin.cpp @@ -20,8 +20,8 @@ #include <android/hidl/memory/1.0/IMemory.h> #include <hidlmemory/mapping.h> +#include <log/log.h> #include <media/stagefright/foundation/AString.h> -#include <utils/Log.h> using android::hardware::hidl_memory; using android::hidl::memory::V1_0::IMemory; diff --git a/drm/1.0/default/DrmFactory.cpp b/drm/1.0/default/DrmFactory.cpp index 72466a14f..7e5d998e4 100644 --- a/drm/1.0/default/DrmFactory.cpp +++ b/drm/1.0/default/DrmFactory.cpp @@ -16,10 +16,10 @@ #define LOG_TAG "android.hardware.drm@1.0-impl" #include "DrmFactory.h" +#include <log/log.h> #include "DrmPlugin.h" #include "LegacyPluginPath.h" #include "TypeConvert.h" -#include <utils/Log.h> namespace android { namespace hardware { diff --git a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp index 2296d2d26..01656f2b4 100644 --- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "drm_hal_clearkey_test@1.0" -#include <android-base/logging.h> #include <android/hardware/drm/1.0/ICryptoFactory.h> #include <android/hardware/drm/1.0/ICryptoPlugin.h> #include <android/hardware/drm/1.0/IDrmFactory.h> @@ -26,6 +25,7 @@ #include <gtest/gtest.h> #include <hidl/HidlSupport.h> #include <hidlmemory/mapping.h> +#include <log/log.h> #include <memory> #include <random> diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp index bd78442cf..b44ace91d 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "drm_hal_vendor_test@1.0" -#include <android-base/logging.h> #include <android/hardware/drm/1.0/ICryptoFactory.h> #include <android/hardware/drm/1.0/ICryptoPlugin.h> #include <android/hardware/drm/1.0/IDrmFactory.h> @@ -25,6 +24,7 @@ #include <android/hidl/allocator/1.0/IAllocator.h> #include <gtest/gtest.h> #include <hidlmemory/mapping.h> +#include <log/log.h> #include <memory> #include <random> diff --git a/drm/1.0/vts/functional/vendor_modules.cpp b/drm/1.0/vts/functional/vendor_modules.cpp index 34af6f86c..e81bbd472 100644 --- a/drm/1.0/vts/functional/vendor_modules.cpp +++ b/drm/1.0/vts/functional/vendor_modules.cpp @@ -18,7 +18,7 @@ #include <dirent.h> #include <dlfcn.h> -#include <utils/Log.h> +#include <log/log.h> #include <memory> #include "shared_library.h" |