commit 9891316f23da8bfa9280591f608aba992b18c15f
author Vic Yang <victoryang@google.com> Wed Aug 21 13:52:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 21 13:52:22 2019 -0700
tree e279844d96e7e541d7e870af61d3b06b55efe5d9
parent 567934b76f35137a01c92ccdbd3924c936beb68f
parent 5429ed8ac0b79416715f1fda468d1624b37cc975

Upgrade String16 users to C++17
am: 5429ed8ac0

Change-Id: I3731ed61cc33e8b0264771c37b64c9ba219ed8dd

common.mk

diff --git a/common.mk b/common.mk
index 0795cbc..d90b248 100644
--- a/common.mk
+++ b/common.mk
@@ -43,7 +43,7 @@
 
 #Common C flags
 common_flags := -Wno-missing-field-initializers
-common_flags += -Wconversion -Wall -Werror -std=c++14
+common_flags += -Wconversion -Wall -Werror
 common_flags += -DUSE_GRALLOC1
 ifeq ($(TARGET_IS_HEADLESS), true)
     common_flags += -DTARGET_HEADLESS

sdm/libs/hwc2/Android.mk

diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 05b4542..79ba307 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -14,7 +14,7 @@
 LOCAL_HEADER_LIBRARIES        := display_headers
 
 LOCAL_CFLAGS                  := -Wno-missing-field-initializers -Wno-unused-parameter \
-                                 -std=c++11 -fcolor-diagnostics\
+                                 -fcolor-diagnostics\
                                  -DLOG_TAG=\"SDM\" $(common_flags)
 LOCAL_CLANG                   := true