C++14 is the default now.
Bug: http://b/32019064
Test: builds
Change-Id: Iacc91f1150cdab2df40db3e33f5b57933ff79824
diff --git a/modules/input/evdev/Android.mk b/modules/input/evdev/Android.mk
index be4db6b..cb12964 100644
--- a/modules/input/evdev/Android.mk
+++ b/modules/input/evdev/Android.mk
@@ -33,7 +33,7 @@
libutils
LOCAL_CLANG := true
-LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
+LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_MODULE := libinput_evdev
LOCAL_MODULE_TAGS := optional
@@ -55,7 +55,7 @@
liblog
LOCAL_CLANG := true
-LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
+LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_MODULE_TAGS := optional
diff --git a/tests/hardware/Android.mk b/tests/hardware/Android.mk
index 02540c9..9927343 100644
--- a/tests/hardware/Android.mk
+++ b/tests/hardware/Android.mk
@@ -4,7 +4,7 @@
LOCAL_MODULE := static-hal-check
LOCAL_SRC_FILES := struct-size.cpp struct-offset.cpp struct-last.cpp
LOCAL_SHARED_LIBRARIES := libhardware
-LOCAL_CFLAGS := -std=gnu++11 -O0
+LOCAL_CFLAGS := -O0
LOCAL_C_INCLUDES += \
system/media/camera/include
diff --git a/tests/input/evdev/Android.mk b/tests/input/evdev/Android.mk
index b892a7f..7f62649 100644
--- a/tests/input/evdev/Android.mk
+++ b/tests/input/evdev/Android.mk
@@ -21,7 +21,6 @@
LOCAL_CLANG := true
LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
-LOCAL_CPPFLAGS += -std=c++14
# TestHelpers uses mktemp. As the path is given to TempFile, we can't do too much
# here (e.g., use mkdtemp first). At least races will lead to an early failure, as