commit | e1e538923be3a0efb2106df675af2e388b93effa | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Jul 18 18:36:22 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 18 18:36:22 2018 -0700 |
tree | 33346d00e1d377c1a1b7e6c2524db9c36e92668d | |
parent | 196d0cdc6dc489d4b4fff53b89f9c240dabd4a9a [diff] | |
parent | f6d46a32f053f4252dd7188880db93ee871fa7bf [diff] |
Merge "C++14 is the default now." am: 8183157774 am: 992916a6af am: 7fe181bf17 Change-Id: I6f5c08e4122a0eacaee442a4053d1bc3a2f3f758
diff --git a/tests/tests/rscpp/librscpptest/Android.mk b/tests/tests/rscpp/librscpptest/Android.mk index 633ee23..8ac550b 100644 --- a/tests/tests/rscpp/librscpptest/Android.mk +++ b/tests/tests/rscpp/librscpptest/Android.mk
@@ -44,7 +44,6 @@ LOCAL_C_INCLUDES += frameworks/rs/cpp LOCAL_C_INCLUDES += frameworks/rs -LOCAL_CPPFLAGS := -std=c++11 LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter LOCAL_SHARED_LIBRARIES := libdl liblog