commit ab25d0bd102f844338d7a4e0fb24e7f24d435e67
author Josh Gao <jmgao@google.com> Thu Aug 10 10:50:33 2017 -0700
committer Josh Gao <jmgao@google.com> Mon Oct 30 12:47:24 2017 -0700
tree 8978a961f3c9ef311885198b9796b882d7914787
parent 38685e188787e657f8b1f5962b963210ecca5ffa

versioner: compile headers in both C and C++ mode.

Bug: https://github.com/android-ndk/ndk/issues/440
Test: python run_tests.py
Change-Id: Ib572a8fdcc00f6b88a25003a085b16ce9698d692

tools/versioner/src/Android.bp

diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index c5afa56..b86228f 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -1,6 +1,8 @@
 cc_binary_host {
     name: "versioner",
 
+    cpp_std: "gnu++17",
+
     srcs: [
         "versioner.cpp",
         "Arch.cpp",
@@ -29,6 +31,7 @@
         "-Wextra",
         "-Werror",
         "-Wno-unused-parameter",
+        "-fno-omit-frame-pointer",
 
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_LIMIT_MACROS",
@@ -37,7 +40,6 @@
     target: {
         host: {
             cppflags: [
-                "-std=gnu++1z",
                 "-fno-rtti",
             ],
         },