diff options
| author | Elliott Hughes <enh@google.com> | 2017-08-23 23:57:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-23 23:57:37 +0000 |
| commit | d53231a511e18c688ce12c34a67cf3a698fdbbe5 (patch) | |
| tree | 42c2492a50da5759d217e22eb57ef3c73c93699b /tests | |
| parent | af922be502ee2d62607142ea3aa61007a53d7385 (diff) | |
| parent | c85724298ea41159b488525f943d8796f9281454 (diff) | |
Merge "C++14 is the default now."
am: c85724298e
Change-Id: I2f23db3ff90d9fcd541176af87bdff2b95cbf6ae
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hardware/Android.mk | 2 | ||||
| -rw-r--r-- | tests/input/evdev/Android.mk | 1 |
2 files changed, 1 insertions, 2 deletions
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 |