Merge "Move up to C++14."
This commit is contained in:
commit
a3c01467ec
@ -29,7 +29,6 @@ benchmark_cflags := \
|
|||||||
-Wunused \
|
-Wunused \
|
||||||
|
|
||||||
benchmark_cppflags := \
|
benchmark_cppflags := \
|
||||||
-std=gnu++11 \
|
|
||||||
|
|
||||||
benchmarklib_src_files := \
|
benchmarklib_src_files := \
|
||||||
Benchmark.cpp \
|
Benchmark.cpp \
|
||||||
|
@ -623,7 +623,6 @@ libc_common_conlyflags := \
|
|||||||
|
|
||||||
# Define some common cppflags
|
# Define some common cppflags
|
||||||
libc_common_cppflags := \
|
libc_common_cppflags := \
|
||||||
-std=gnu++11
|
|
||||||
|
|
||||||
# Define some common includes
|
# Define some common includes
|
||||||
# ========================================================
|
# ========================================================
|
||||||
|
@ -42,7 +42,6 @@ LOCAL_CONLYFLAGS += \
|
|||||||
-std=gnu99 \
|
-std=gnu99 \
|
||||||
|
|
||||||
LOCAL_CPPFLAGS += \
|
LOCAL_CPPFLAGS += \
|
||||||
-std=gnu++11 \
|
|
||||||
-Wold-style-cast \
|
-Wold-style-cast \
|
||||||
|
|
||||||
ifeq ($(TARGET_IS_64_BIT),true)
|
ifeq ($(TARGET_IS_64_BIT),true)
|
||||||
|
@ -23,7 +23,7 @@ LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
|
|||||||
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||||
|
|
||||||
LOCAL_CFLAGS += -g -Wall -Wextra -Wunused -Werror -std=gnu++11
|
LOCAL_CFLAGS += -g -Wall -Wextra -Wunused -Werror
|
||||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../libc/
|
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../libc/
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
|
@ -46,8 +46,7 @@ else
|
|||||||
test_cflags += -DUSE_JEMALLOC
|
test_cflags += -DUSE_JEMALLOC
|
||||||
endif
|
endif
|
||||||
|
|
||||||
test_cppflags = \
|
test_cppflags := \
|
||||||
-std=gnu++11 \
|
|
||||||
|
|
||||||
libBionicStandardTests_src_files := \
|
libBionicStandardTests_src_files := \
|
||||||
arpa_inet_test.cpp \
|
arpa_inet_test.cpp \
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
LOCAL_PATH := $(call my-dir)
|
LOCAL_PATH := $(call my-dir)
|
||||||
TEST_PATH := $(LOCAL_PATH)/..
|
TEST_PATH := $(LOCAL_PATH)/..
|
||||||
|
|
||||||
common_cppflags += -std=gnu++11
|
common_cppflags :=
|
||||||
common_additional_dependencies := \
|
common_additional_dependencies := \
|
||||||
$(LOCAL_PATH)/Android.mk \
|
$(LOCAL_PATH)/Android.mk \
|
||||||
$(LOCAL_PATH)/Android.build.dt_runpath.mk \
|
$(LOCAL_PATH)/Android.build.dt_runpath.mk \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user