diff options
| -rw-r--r-- | modules/input/evdev/Android.mk | 4 | ||||
| -rw-r--r-- | tests/hardware/Android.mk | 2 | ||||
| -rw-r--r-- | tests/input/evdev/Android.mk | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/modules/input/evdev/Android.mk b/modules/input/evdev/Android.mk index be4db6bc..cb129645 100644 --- a/modules/input/evdev/Android.mk +++ b/modules/input/evdev/Android.mk @@ -33,7 +33,7 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 02540c98..99273433 100644 --- a/tests/hardware/Android.mk +++ b/tests/hardware/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) 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 b892a7fc..7f62649b 100644 --- a/tests/input/evdev/Android.mk +++ b/tests/input/evdev/Android.mk @@ -21,7 +21,6 @@ LOCAL_SHARED_LIBRARIES := \ 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 |