diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | gpu_tonemapper/Android.mk | 2 | ||||
| -rw-r--r-- | libdebug/Android.mk | 2 | ||||
| -rw-r--r-- | libdrmutils/Android.mk | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc2/Android.mk | 2 |
6 files changed, 5 insertions, 6 deletions
@@ -5,7 +5,6 @@ cc_defaults { "-Wconversion", "-Wall", "-Werror", - "-std=c++14", ], shared_libs: [ "liblog", @@ -12,7 +12,7 @@ display_config_version := $(shell \ #Common C flags common_flags := -Wno-missing-field-initializers -common_flags += -Wconversion -Wall -Werror -std=c++14 +common_flags += -Wconversion -Wall -Werror common_flags += -DUSE_GRALLOC1 ifeq ($(TARGET_IS_HEADLESS), true) common_flags += -DTARGET_HEADLESS diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 6c6ccd16..3c3d8d38 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -17,7 +17,7 @@ LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ - -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\" + -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\" LOCAL_SRC_FILES := TonemapFactory.cpp \ glengine.cpp \ diff --git a/libdebug/Android.mk b/libdebug/Android.mk index 14e5de09..bbe8555b 100644 --- a/libdebug/Android.mk +++ b/libdebug/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE := libdisplaydebug LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdl -LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -std=c++11 -Werror -fno-operator-names +LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -Werror -fno-operator-names LOCAL_CLANG := true LOCAL_SRC_FILES := debug_handler.cpp diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk index 97c052b1..172233f9 100644 --- a/libdrmutils/Android.mk +++ b/libdrmutils/Android.mk @@ -8,7 +8,7 @@ LOCAL_C_INCLUDES := external/libdrm \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_HEADER_LIBRARIES := display_headers LOCAL_SHARED_LIBRARIES := libdrm libdl libdisplaydebug -LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names +LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -Werror -fno-operator-names LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_SRC_FILES := drm_master.cpp drm_res_mgr.cpp drm_lib_loader.cpp diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk index 8d02197b..67a410e9 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -12,7 +12,7 @@ LOCAL_C_INCLUDES := $(common_includes) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \ - -std=c++11 -fcolor-diagnostics\ + -fcolor-diagnostics\ -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_CLANG := true |