aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-10-07 15:21:33 -0700
committerElliott Hughes <enh@google.com>2016-10-07 15:21:33 -0700
commit8f9d31cae2bee61afd26cfb4c1933793e01dd086 (patch)
tree80fbee6627a839aa4f218c5bc82d487ebb463b18
parent78f7222e994d60fa2d95cab5f95295cd4574777a (diff)
downloadnvram-8f9d31cae2bee61afd26cfb4c1933793e01dd086.tar.gz
Rely on the platform -std default.android-n-mr1-preview-2android-n-mr1-preview-1
Bug: http://b/32019064 Test: builds Change-Id: I855a44786617faaf5c6e0e48644bc992b31fb2b3
-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/