diff options
| author | Vic Yang <victoryang@google.com> | 2019-08-15 13:55:04 -0700 |
|---|---|---|
| committer | Vic Yang <victoryang@google.com> | 2019-08-15 13:55:04 -0700 |
| commit | 96e0347b0b8aa66555cae4eb17264b9174dbdf75 (patch) | |
| tree | 4b826935ef4a8feb5ed97ea449872273ec23202f | |
| parent | ba2497a03e85b81c591e52a0c3e4fe554aaa6ac2 (diff) | |
| download | display-96e0347b0b8aa66555cae4eb17264b9174dbdf75.tar.gz | |
Upgrade String16 users to C++17
Bug: 138856262
Test: Build success.
Change-Id: I22ca9c89f871995801613d295e22b64df7d4eef0
| -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 d50f3a4c..ede5a645 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 |