ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Rom Lemarchand 2016-01-23 03:41:39 +00:00 • committed by Gerrit Code Review
commit 738f0e3edf
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstat/Android.mk
View file

@ -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)