diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-05 22:42:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-05 22:42:18 +0000 |
| commit | 32c621a863f574584b104ec3bd279f90738c40bf (patch) | |
| tree | ba4690e8fe4715a2c8693c38cbc82072d25179a9 | |
| parent | c3e57650b69a2c57152d70cbf76398cc1b2313df (diff) | |
| parent | 1959301b5a4f1cf5547eabdbebbf407edf73c402 (diff) | |
| download | rs-32c621a863f574584b104ec3bd279f90738c40bf.tar.gz | |
Merge "rsHidlAdaptation: Include log/log.h, since it uses ALOG*" into oc-dev
| -rw-r--r-- | rsHidlAdaptation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rsHidlAdaptation.cpp b/rsHidlAdaptation.cpp index 2ec10697..ead47542 100644 --- a/rsHidlAdaptation.cpp +++ b/rsHidlAdaptation.cpp @@ -14,11 +14,14 @@ * limitations under the License. */ +#define LOG_TAG "RenderScript HIDL Adaptation" + #include "cpp/rsDispatch.h" #include "rsHidlAdaptation.h" #include "rsFallbackAdaptation.h" #include <cutils/properties.h> +#include <log/log.h> using ::android::hardware::renderscript::V1_0::IDevice; using ::android::hardware::renderscript::V1_0::IContext; @@ -51,9 +54,6 @@ using ::android::hardware::Return; using ::android::hardware::Void; using ::android::sp; -#undef LOG_TAG -#define LOG_TAG "RenderScript HIDL Adaptation" - dispatchTable RsHidlAdaptation::mEntryFuncs; sp<IDevice> RsHidlAdaptation::mHidl; std::set<sp<IContext> > RsHidlAdaptation::mContexts; |