diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 17:37:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-14 17:37:53 +0000 |
| commit | 26a2814963de75f14dfbe7cf3d45e993727891cf (patch) | |
| tree | ee3b0dcc1bd93bad701f1d8c0c5af75d535017a3 /services/surfaceflinger/Android.mk | |
| parent | cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335 (diff) | |
| parent | f3da24d8cf02d7c74ff7c24eae0154a21a192fda (diff) | |
| download | frameworks_native-26a2814963de75f14dfbe7cf3d45e993727891cf.zip frameworks_native-26a2814963de75f14dfbe7cf3d45e993727891cf.tar.gz frameworks_native-26a2814963de75f14dfbe7cf3d45e993727891cf.tar.bz2 | |
Merge "Link sigchain to surfaceflinger main executable"
Diffstat (limited to 'services/surfaceflinger/Android.mk')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 49a017f..3416e48 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -106,17 +106,24 @@ include $(BUILD_SHARED_LIBRARY) # build surfaceflinger's executable include $(CLEAR_VARS) -LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" +LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic +LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" -Iart +LOCAL_CPPFLAGS:= -std=c++11 +# TODO: Trying to link libsigchain as a static library prevents +# static linker from exporting necessary symbols. So as a workaround +# we use sigchain.o LOCAL_SRC_FILES:= \ - main_surfaceflinger.cpp + main_surfaceflinger.cpp \ + sigchain_proxy.cpp LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger \ libcutils \ liblog \ libbinder \ - libutils + libutils \ + libdl LOCAL_MODULE:= surfaceflinger |