summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2021-01-25 21:27:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-25 21:27:13 +0000
commit7298497d5b3d860c3c0c94a928aa7d1082a944f1 (patch)
tree7f0779c48271cd71c820c022682b8cedce4ee6ea
parent057ec0f1c82a0f4f937da43c9f5220cae10025ec (diff)
parentbf8445ce7a9b542a9ad0f8fd9fe7188bb5132000 (diff)
downloadlibhidl-7298497d5b3d860c3c0c94a928aa7d1082a944f1.tar.gz
Merge "libhidl_test: fatal -> error warning" am: a89f743b5a am: 4042b96f62 am: bf8445ce7a
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1558666 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1009d0607e34c016e5ae7d256e20f3cd298b783
-rw-r--r--test_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test_main.cpp b/test_main.cpp
index 0a1e97b..ea4dfd1 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -17,7 +17,7 @@
#define LOG_TAG "LibHidlTest"
#pragma clang diagnostic push
-#pragma clang diagnostic fatal "-Wpadded"
+#pragma clang diagnostic error "-Wpadded"
#include <hidl/HidlInternal.h>
#include <hidl/HidlSupport.h>
#pragma clang diagnostic pop