summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-10-10 16:31:12 -0500
committerElliott Hughes2016-10-10 16:31:12 -0500
commit36e0d390a2de7d13cdf667d9a7d125f0d66b3107 (patch)
treeb7ae89c6bbe40c5e820b8ddc2e2f073a67794911 /libcrypto_utils
parent0d762648d0b9cb29f13f3f8cb7815236078fafbd (diff)
downloadplatform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.gz
platform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.xz
platform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.zip
Rely on the platform -std default.
Bug: http://b/32019064 Test: builds Change-Id: I18a1d816d63b64601485045070851f32d44e85eb
Diffstat (limited to 'libcrypto_utils')
-rw-r--r--libcrypto_utils/Android.bp1
-rw-r--r--libcrypto_utils/tests/Android.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp
index ca7bd3119..f2560e6a3 100644
--- a/libcrypto_utils/Android.bp
+++ b/libcrypto_utils/Android.bp
@@ -24,7 +24,6 @@ cc_library {
24 "-Wall", 24 "-Wall",
25 "-Wextra", 25 "-Wextra",
26 "-Werror", 26 "-Werror",
27 "-std=c99",
28 ], 27 ],
29 local_include_dirs: ["include"], 28 local_include_dirs: ["include"],
30 export_include_dirs: ["include"], 29 export_include_dirs: ["include"],
diff --git a/libcrypto_utils/tests/Android.mk b/libcrypto_utils/tests/Android.mk
index bdaef71f2..ef3d0cf57 100644
--- a/libcrypto_utils/tests/Android.mk
+++ b/libcrypto_utils/tests/Android.mk
@@ -19,6 +19,6 @@ LOCAL_PATH := $(call my-dir)
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20LOCAL_MODULE := libcrypto_utils_test 20LOCAL_MODULE := libcrypto_utils_test
21LOCAL_SRC_FILES := android_pubkey_test.cpp 21LOCAL_SRC_FILES := android_pubkey_test.cpp
22LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11 22LOCAL_CFLAGS := -Wall -Werror -Wextra
23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto 23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto
24include $(BUILD_HOST_NATIVE_TEST) 24include $(BUILD_HOST_NATIVE_TEST)