diff options
| author | Dan Stoza <stoza@google.com> | 2015-01-16 16:18:51 -0800 |
|---|---|---|
| committer | Dan Stoza <stoza@google.com> | 2015-01-16 16:18:51 -0800 |
| commit | 3372cc25df255b94e4eb75920afaf43ee5edc39f (patch) | |
| tree | 4a274cb51bb8c9e08d885628c5dc40b4e89f96f3 /services/surfaceflinger/Android.mk | |
| parent | 499127eab812088ca24421b59ebfac6f47ea850f (diff) | |
| parent | 03eccb6616744c3789b6018680de7bf5a18f71ce (diff) | |
| download | frameworks_native-3372cc25df255b94e4eb75920afaf43ee5edc39f.zip frameworks_native-3372cc25df255b94e4eb75920afaf43ee5edc39f.tar.gz frameworks_native-3372cc25df255b94e4eb75920afaf43ee5edc39f.tar.bz2 | |
resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp
Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
Diffstat (limited to 'services/surfaceflinger/Android.mk')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 61edbff..13d1a55 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -90,7 +90,7 @@ else endif LOCAL_CFLAGS += -fvisibility=hidden -Werror=format -LOCAL_CPPFLAGS := -std=c++11 +LOCAL_CPPFLAGS := -std=c++1y LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -110,6 +110,8 @@ LOCAL_MODULE := libsurfaceflinger LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +include external/libcxx/libcxx.mk + include $(BUILD_SHARED_LIBRARY) ############################################################### |