summaryrefslogtreecommitdiff
authorRobin Lee <rgl@google.com>2019-09-08 13:15:35 (GMT)
committer sky zhou <sky.zhou@amlogic.com>2020-05-25 13:56:54 (GMT)
commitffd6cf2849c19b55241fc4680b362ed16d8a1f0d (patch)
tree48eade46a109a29c6146e2d879abbba553e5f23e
parent21a882b4a5fdf9272354ebb191dd34edd6ebc232 (diff)
downloadhwcomposer-ffd6cf2849c19b55241fc4680b362ed16d8a1f0d.zip
hwcomposer-ffd6cf2849c19b55241fc4680b362ed16d8a1f0d.tar.gz
hwcomposer-ffd6cf2849c19b55241fc4680b362ed16d8a1f0d.tar.bz2
Move all hardware/amlogic code to C++17
This is required because of the change to StaticString16 to use C++17 features. Explicitly overridding to C++14 will cause a build error like the following: vendor/amlogic/common/frameworks/services/remotecontrol/server_main.cpp:24: frameworks/native/libs/binder/include/binder/IPCThreadState.h:21: frameworks/native/libs/binder/include/binder/Parcel.h:30: system/core/libutils/include/utils/String16.h:240:1: error: C++ requires a type specifier for all declarations StaticString16(const F&)->StaticString16<sizeof(F) / sizeof(char16_t)>; ^ 1 error generated. Test: make -j rc_server Test: make -j dist # (franklin) Change-Id: I82ec9b845ffa337f4dd749ffb046cfc67a493cee
Diffstat
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 4450036..0546508 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,8 +14,6 @@
LOCAL_PATH := $(call my-dir)
-HWC_CPP_FLAGS := -std=c++14
-
HWC_C_FLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifeq ($(TARGET_BUILD_VARIANT), user)
HWC_C_FLAGS += -DHWC_RELEASE=1