commit | 5202a4261964d90c80e7ba4314eab03c624abf10 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 11 21:03:22 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 21:03:22 2023 +0000 |
tree | f0f7367ef5b22ce537782960627dfc5c3b2eea61 | |
parent | 7ff88bfa6081602abfaf50d84896618535beb69e [diff] | |
parent | 7b33b192c08811ece76ff7eb4902461144fa2054 [diff] |
Merge "Limit LOG_TAG in header" am: 248026347f am: 7b33b192c0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2382934 Change-Id: I2a527654b0ab73a369b0d7ae8c3e4f990421ed01 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>