diff options
| author | Ramakant Singh <ramakant@codeaurora.org> | 2019-10-18 10:34:35 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-10-21 04:11:41 -0700 |
| commit | baf3c5023f4fecc1f4c18c25da9959c3d5bfc7ca (patch) | |
| tree | 508ecdf97a289cc3fb49572b2cccb0e6ace9e144 | |
| parent | 1fd52d423fdddda61bdf8b8550c54f2ea7b12ff6 (diff) | |
display: Remove C++ standard flags
Some headers included by display modules require c++17 now in newer
builds. Remove the forced standard setting to let the build pick
the latest C++ version
Change-Id: I76f9e0c03ce08100c3dd7caf5932eaa941fff0c8
| -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", @@ -3,7 +3,7 @@ display_top := $(call my-dir) #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 61b134f4..fd34da98 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 := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 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 e975a22a..3ed33949 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 LOCAL_COPY_HEADERS_TO := qcom/display 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 042b9cd9..0ec89da5 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -14,7 +14,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) 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 |