diff options
| author | Elliott Hughes <enh@google.com> | 2016-10-09 00:28:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-09 00:28:56 +0000 |
| commit | db9fd64f5e21a5164cd8a1a0d942f4fefb3e5713 (patch) | |
| tree | c74703674e178f841aed2f39f1ff710c6860f39f /tests | |
| parent | d2f8e15baf0bfa2837c072cddcf3e8006d26f5de (diff) | |
| parent | 1ed82a7eabe6d7c029b6b3aa0d272b517ab51050 (diff) | |
| download | extras-db9fd64f5e21a5164cd8a1a0d942f4fefb3e5713.tar.gz | |
Merge "Rely on the platform -std default." am: 329e73bda6 am: 6b24b5786d am: 6655268162
am: 1ed82a7eab
Change-Id: I0a6d54d811a63c2e3356f854a7b8f26f12a62519
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kernel.config/Android.mk | 1 | ||||
| -rw-r--r-- | tests/lib/testUtil/Android.mk | 1 | ||||
| -rw-r--r-- | tests/pagingtest/Android.mk | 2 | ||||
| -rw-r--r-- | tests/tcp_nuke_addr/Android.mk | 2 | ||||
| -rw-r--r-- | tests/timetest/Android.mk | 1 |
5 files changed, 1 insertions, 6 deletions
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index 756344bc..0f64aed2 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -12,7 +12,6 @@ test_c_flags := \ -Wall -Wextra \ -Werror \ -fno-builtin \ - -std=gnu++11 # Required Tests cts_src_files := \ diff --git a/tests/lib/testUtil/Android.mk b/tests/lib/testUtil/Android.mk index f814dac3..c5ae26d3 100644 --- a/tests/lib/testUtil/Android.mk +++ b/tests/lib/testUtil/Android.mk @@ -21,7 +21,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE:= libtestUtil LOCAL_SRC_FILES:= testUtil.c LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include -LOCAL_CFLAGS += -std=c99 LOCAL_SHARED_LIBRARIES += libcutils libutils diff --git a/tests/pagingtest/Android.mk b/tests/pagingtest/Android.mk index 23ffea19..727e3b81 100644 --- a/tests/pagingtest/Android.mk +++ b/tests/pagingtest/Android.mk @@ -8,8 +8,6 @@ LOCAL_SRC_FILES:= \ pageinout_test.c \ thrashing_test.c -LOCAL_CFLAGS := -std=gnu11 - LOCAL_MODULE:= pagingtest LOCAL_MODULE_TAGS := tests diff --git a/tests/tcp_nuke_addr/Android.mk b/tests/tcp_nuke_addr/Android.mk index 2eef6089..f45677ea 100644 --- a/tests/tcp_nuke_addr/Android.mk +++ b/tests/tcp_nuke_addr/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := tcp_nuke_addr_test LOCAL_C_INCLUDES += frameworks/native/include external/libcxx/include -LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror +LOCAL_CPPFLAGS += -Wall -Werror LOCAL_SHARED_LIBRARIES := libc++ LOCAL_SRC_FILES := tcp_nuke_addr_test.cpp LOCAL_MODULE_TAGS := eng tests diff --git a/tests/timetest/Android.mk b/tests/timetest/Android.mk index b2a1aa5b..92bbf1ee 100644 --- a/tests/timetest/Android.mk +++ b/tests/timetest/Android.mk @@ -28,7 +28,6 @@ test_c_flags := \ -Wall -Wextra \ -Werror \ -fno-builtin \ - -std=gnu++11 test_src_files := \ rtc_test.cpp |