Merge "C++14 is the default now."
This commit is contained in:
commit
c85724298e
3 changed files with 3 additions and 4 deletions
|
@ -33,7 +33,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||
libutils
|
||||
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
|
||||
LOCAL_CPPFLAGS += -Wno-unused-parameter
|
||||
|
||||
LOCAL_MODULE := libinput_evdev
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
@ -55,7 +55,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||
liblog
|
||||
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_CPPFLAGS += -std=c++14 -Wno-unused-parameter
|
||||
LOCAL_CPPFLAGS += -Wno-unused-parameter
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ include $(CLEAR_VARS)
|
|||
LOCAL_MODULE := static-hal-check
|
||||
LOCAL_SRC_FILES := struct-size.cpp struct-offset.cpp struct-last.cpp
|
||||
LOCAL_SHARED_LIBRARIES := libhardware
|
||||
LOCAL_CFLAGS := -std=gnu++11 -O0
|
||||
LOCAL_CFLAGS := -O0
|
||||
|
||||
LOCAL_C_INCLUDES += \
|
||||
system/media/camera/include
|
||||
|
|
|
@ -21,7 +21,6 @@ LOCAL_SHARED_LIBRARIES := \
|
|||
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
|
||||
LOCAL_CPPFLAGS += -std=c++14
|
||||
|
||||
# TestHelpers uses mktemp. As the path is given to TempFile, we can't do too much
|
||||
# here (e.g., use mkdtemp first). At least races will lead to an early failure, as
|
||||
|
|
Loading…
Reference in a new issue