diff options
| author | Vic Yang <victoryang@google.com> | 2019-08-19 21:55:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-19 21:55:35 -0700 |
| commit | 7dfbdbfe442fe0f12d0ba2b82d63bdb41df43941 (patch) | |
| tree | 5eed766080f00c2a28088e2cc07845699887a0b5 | |
| parent | ec5d48beed37e8668b7c765e67176b0a9a33c002 (diff) | |
| parent | b3ac32d3f0e5fbfdac569a7035e922a1d526020f (diff) | |
| download | display-7dfbdbfe442fe0f12d0ba2b82d63bdb41df43941.tar.gz | |
Upgrade String16 users to C++17 am: 96e0347b0b am: 7078612fc0
am: b3ac32d3f0
Change-Id: Ic4d21d883631cc2ba3a0803fc9639093f6d389ec
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | gralloc/Android.mk | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc2/Android.mk | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 |