Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b7b872e authored by Rom Lemarchand's avatar Rom Lemarchand Committed by android-build-merger
Browse files

Merge "bootstat: Use Clang and c++14 standard" 

am: 738f0e3e

* commit '738f0e3e':
  bootstat: Use Clang and c++14 standard
parents b65e80e5 738f0e3e

bootstat/Android.mk

+11 −1
Original line number Diff line number Diff line
@@ -40,12 +40,16 @@ bootstat_cflags := \ 
        -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_CPPFLAGS := $(bootstat_cppflags) 
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_CPPFLAGS := $(bootstat_debug_cppflags) 
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_CPPFLAGS := $(bootstat_cppflags) 
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_C_INCLUDES := $(bootstat_c_includes) 
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_CPPFLAGS := $(bootstat_cppflags) 
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_CPPFLAGS := $(bootstat_cppflags) 
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)