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

Commit 4606c957 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Gerrit Code Review
Browse files

Merge "Removing -std=c++14 from bootstat Android.mk"

parents e04b60d2 5699ee88

bootstat/Android.mk

+7 −5
Original line number Diff line number Diff line
@@ -40,16 +40,12 @@ bootstat_cflags := \ 
        -Werror



bootstat_cppflags := \

        -Wno-non-virtual-dtor \

        -std=c++14

        -Wno-non-virtual-dtor



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
@@ -66,6 +62,7 @@ LOCAL_CPPFLAGS := $(bootstat_cppflags) 
LOCAL_C_INCLUDES := $(bootstat_c_includes)

LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)

LOCAL_SRC_FILES := $(bootstat_lib_src_files)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_STATIC_LIBRARY)
@@ -81,6 +78,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)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_STATIC_LIBRARY)
@@ -96,6 +94,7 @@ LOCAL_CPPFLAGS := $(bootstat_cppflags) 
LOCAL_C_INCLUDES := $(bootstat_c_includes)

LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)

LOCAL_SRC_FILES := $(bootstat_lib_src_files)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_HOST_STATIC_LIBRARY)
@@ -112,6 +111,7 @@ LOCAL_C_INCLUDES := $(bootstat_c_includes) 
LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)

LOCAL_STATIC_LIBRARIES := libbootstat

LOCAL_SRC_FILES := $(bootstat_src_files)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_EXECUTABLE)
@@ -127,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)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_NATIVE_TEST)
@@ -142,6 +143,7 @@ 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)

# Clang is required because of C++14

LOCAL_CLANG := true



include $(BUILD_HOST_NATIVE_TEST)