diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 18:21:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 18:21:44 +0000 |
| commit | 9b9d1a4ee54817028549e3b3c49f5c9898b11406 (patch) | |
| tree | baac9150da483094b362e487994608fe0947ebe0 /services/surfaceflinger/Android.mk | |
| parent | e7e61beffc8be64f604781d7b7ea96828bbb554d (diff) | |
| parent | 26a2814963de75f14dfbe7cf3d45e993727891cf (diff) | |
| download | frameworks_native-9b9d1a4ee54817028549e3b3c49f5c9898b11406.zip frameworks_native-9b9d1a4ee54817028549e3b3c49f5c9898b11406.tar.gz frameworks_native-9b9d1a4ee54817028549e3b3c49f5c9898b11406.tar.bz2 | |
am 26a28149: Merge "Link sigchain to surfaceflinger main executable"
* commit '26a2814963de75f14dfbe7cf3d45e993727891cf':
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 183478d..57e94ef 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -108,17 +108,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 |