aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-10-10 22:47:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-10 22:47:31 +0000
commitb53fc0a1e9f4634e03cc651807c99468a353175d (patch)
tree80fbee6627a839aa4f218c5bc82d487ebb463b18
parentc36872e10db988b6c2755ed718aafa962242cd84 (diff)
parentf82b622ebabe275dae3b35d5cf1563167bcc6459 (diff)
downloadnvram-b53fc0a1e9f4634e03cc651807c99468a353175d.tar.gz
Rely on the platform -std default. am: 8f9d31cae2 am: d48fb4b802
am: f82b622eba Change-Id: I24897e8f6daa044031f380d696e6cc71e5fea2a9
-rw-r--r--core/rules.mk2
-rw-r--r--core/tests/rules.mk2
-rw-r--r--messages/rules.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/rules.mk b/core/rules.mk
index 2afd570..638a53d 100644
--- a/core/rules.mk
+++ b/core/rules.mk
@@ -26,7 +26,7 @@ MODULE_SRCS += \
$(LOCAL_DIR)/nvram_manager.cpp \
$(LOCAL_DIR)/persistence.cpp
-MODULE_CPPFLAGS := -Wall -Werror -Wextra -std=c++11
+MODULE_CPPFLAGS := -Wall -Werror -Wextra
MODULE_DEPS += \
external/openssl \
diff --git a/core/tests/rules.mk b/core/tests/rules.mk
index 5dae25a..b4252ea 100644
--- a/core/tests/rules.mk
+++ b/core/tests/rules.mk
@@ -24,7 +24,7 @@ MODULE_SRCS += \
$(LOCAL_DIR)/gtest_stubs.cpp \
$(LOCAL_DIR)/manifest.c
-MODULE_CPPFLAGS := -Wall -Werror -Wextra -std=c++11
+MODULE_CPPFLAGS := -Wall -Werror -Wextra
MODULE_DEPS += \
app/trusty \
diff --git a/messages/rules.mk b/messages/rules.mk
index fb46aa3..0451d08 100644
--- a/messages/rules.mk
+++ b/messages/rules.mk
@@ -27,7 +27,7 @@ MODULE_SRCS := \
MODULE_DEPS := \
lib/libc
-MODULE_CPPFLAGS := -Wall -Werror -Wextra -std=c++11
+MODULE_CPPFLAGS := -Wall -Werror -Wextra
GLOBAL_INCLUDES += $(LOCAL_DIR)/include/