diff options
| author | Elliott Hughes <enh@google.com> | 2018-07-20 22:39:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-20 22:39:59 -0700 |
| commit | 2dbfcf683ab2c6b0ade12f86bf4fe8fbd244d131 (patch) | |
| tree | cd86e8c14da4f5f3baee1aff009ecb1c9861a01e /tests | |
| parent | 0dca9d090084232a200dce54906ecedaef3de1ad (diff) | |
| parent | f6fa86166c74f434c2a59b2bb722839978e5dff6 (diff) | |
| download | rs-2dbfcf683ab2c6b0ade12f86bf4fe8fbd244d131.tar.gz | |
Merge "C++14 is the default now." am: d0b9241f66 am: ad5fe1cbde am: 033ce057c7
am: f6fa86166c
Change-Id: I313f2f385732ac8d3a71304a70a1ff5856ea14bb
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cpp_api/common.mk | 2 | ||||
| -rw-r--r-- | tests/java_api/HelloComputeNDK/Android.mk | 2 | ||||
| -rw-r--r-- | tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/tests/cpp_api/common.mk b/tests/cpp_api/common.mk index 974aadbb..9bad7901 100644 --- a/tests/cpp_api/common.mk +++ b/tests/cpp_api/common.mk @@ -1,6 +1,6 @@ LOCAL_MODULE_TAGS := tests -LOCAL_CFLAGS += -std=c++11 -Werror -Wall -Wextra +LOCAL_CFLAGS += -Werror -Wall -Wextra LOCAL_LDFLAGS += -llog intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,) diff --git a/tests/java_api/HelloComputeNDK/Android.mk b/tests/java_api/HelloComputeNDK/Android.mk index f00080d7..2f5bd17f 100644 --- a/tests/java_api/HelloComputeNDK/Android.mk +++ b/tests/java_api/HelloComputeNDK/Android.mk @@ -17,8 +17,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS := -std=c++11 - LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ diff --git a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk index 09b4077d..9f72588c 100644 --- a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := helloComputeNDK.cpp mono.rs LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) -LOCAL_CFLAGS := -std=c++11 -Wall -Werror +LOCAL_CFLAGS := -Wall -Werror LOCAL_LDFLAGS := -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := libdl liblog libjnigraphics LOCAL_STATIC_LIBRARIES := libRScpp_static |