commit 91b2b86fcd5226cbc1faf49a49d68831a71dc9a7
author David Anderson <dvander@google.com> Mon Aug 13 15:41:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 13 15:41:16 2018 -0700
tree ee478c72816c8ee46df1f4bdebbf9e5ce9582dcd
parent b5c6e410ac989d1641ca3d0aead2a3fee5c8859c
parent 07ffa5b1f1f7cee9461f2614aa3c37392d20e73c

Merge "Allow C++17 in fastboot." am: 088d18e619
am: 07ffa5b1f1

Change-Id: I97441609e94d4fd50ead6b8c2926ea3f7c51e143

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 60c338c..a679143 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -82,6 +82,7 @@
 
 LOCAL_CFLAGS := $(fastboot_cflags)
 LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)
+LOCAL_CPP_STD := c++17
 LOCAL_CXX_STL := $(fastboot_stl)
 LOCAL_HEADER_LIBRARIES := bootimg_headers
 LOCAL_LDLIBS_darwin := $(fastboot_ldlibs_darwin)