summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk2
-rw-r--r--gralloc/Android.mk2
-rw-r--r--sdm/libs/hwc2/Android.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index fdfd1fff..9c32fc18 100644
--- a/common.mk
+++ b/common.mk
@@ -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/gralloc/Android.mk b/gralloc/Android.mk
index f2184aa5..33808bb2 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libsync libgralloc
libgralloccore \
android.hardware.graphics.mapper@2.0 \
android.hardware.graphics.mapper@2.1
-LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wall -std=c++14 -Werror
+LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wall -Werror
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
LOCAL_SRC_FILES := gr_device_impl.cpp
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 085abce9..9a1acc7d 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