| commit | 7b33b192c08811ece76ff7eb4902461144fa2054 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 11 20:07:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 20:07:29 2023 +0000 |
| tree | 833a5ad17135441a71985d1b650007dd27c2ecae | |
| parent | a07593217c7cda1e3d4180562be91fb5a98eb399 [diff] | |
| parent | 248026347fbcc5a5c1a8cfcf9e023413c0c6c457 [diff] |
Merge "Limit LOG_TAG in header" am: 248026347f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2382934 Change-Id: I586453377c17a9312a0b7d4e456dbd224867a626 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/provider/aidl/vts/camera_aidl_test.h b/camera/provider/aidl/vts/camera_aidl_test.h index d828cee..3741a64 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.h +++ b/camera/provider/aidl/vts/camera_aidl_test.h
@@ -17,7 +17,10 @@ #ifndef HARDWARE_INTERFACES_CAMERA_PROVIDER_AIDL_VTS_CAMERA_AIDL_TEST_H_ #define HARDWARE_INTERFACES_CAMERA_PROVIDER_AIDL_VTS_CAMERA_AIDL_TEST_H_ +// TODO: LOG_TAG should not be in header +#ifndef LOG_TAG #define LOG_TAG "camera_aidl_hal_test" +#endif #include <string> #include <unordered_map>