commit 484f2a0d101edb0ca79912c94873bfe7111fff27
author Rom Lemarchand <romlem@android.com> Fri Jan 22 18:19:56 2016 -0800
committer Rom Lemarchand <romlem@google.com> Fri Jan 22 19:11:20 2016 -0800
tree 088f1ac307a3b906637e706cf069fdb3cbe4b81b
parent 89928dac28dee2e1a101cb88bc2b29eb3b11a2fd

bootstat: Use Clang and c++14 standard

Change-Id: Ic156eea4d8731e67b26da0a56a7e69b13df659cb

bootstat/Android.mk

diff --git a/bootstat/Android.mk b/bootstat/Android.mk
index 348db88..529fd33 100644
--- a/bootstat/Android.mk
+++ b/bootstat/Android.mk
@@ -40,12 +40,16 @@
         -Werror
 
 bootstat_cppflags := \
-        -Wno-non-virtual-dtor
+        -Wno-non-virtual-dtor \
+        -std=c++14
 
 bootstat_debug_cflags := \
         $(bootstat_cflags) \
         -UNDEBUG
 
+bootstat_debug_cppflags := \
+        -std=c++14
+
 # 524291 corresponds to sysui_histogram, from
 # frameworks/base/core/java/com/android/internal/logging/EventLogTags.logtags
 bootstat_cflags += -DHISTOGRAM_LOG_TAG=524291
@@ -62,6 +66,7 @@
 LOCAL_C_INCLUDES := $(bootstat_c_includes)
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_SRC_FILES := $(bootstat_lib_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -76,6 +81,7 @@
 LOCAL_C_INCLUDES := $(bootstat_c_includes)
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_SRC_FILES := $(bootstat_lib_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -90,6 +96,7 @@
 LOCAL_C_INCLUDES := $(bootstat_c_includes)
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_SRC_FILES := $(bootstat_lib_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -105,6 +112,7 @@
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_STATIC_LIBRARIES := libbootstat
 LOCAL_SRC_FILES := $(bootstat_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_EXECUTABLE)
 
@@ -119,6 +127,7 @@
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_STATIC_LIBRARIES := libbootstat_debug libgmock
 LOCAL_SRC_FILES := $(bootstat_test_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_NATIVE_TEST)
 
@@ -133,5 +142,6 @@
 LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
 LOCAL_STATIC_LIBRARIES := libbootstat_host_debug libgmock_host
 LOCAL_SRC_FILES := $(bootstat_test_src_files)
+LOCAL_CLANG := true
 
 include $(BUILD_HOST_NATIVE_TEST)