diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-20 14:17:26 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-20 14:17:26 -0700 |
| commit | 4340a14fbfe761a46e7a655b568cbd0953773df3 (patch) | |
| tree | 8144649f6e2bde03da740d206b12e6680fe1e3d5 /services/surfaceflinger/Android.mk | |
| parent | c52e54c47184704613d446eb15d051ceb43d82b3 (diff) | |
| download | frameworks_native-4340a14fbfe761a46e7a655b568cbd0953773df3.zip frameworks_native-4340a14fbfe761a46e7a655b568cbd0953773df3.tar.gz frameworks_native-4340a14fbfe761a46e7a655b568cbd0953773df3.tar.bz2 | |
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
Diffstat (limited to 'services/surfaceflinger/Android.mk')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 3416e48..b0b13e7 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -107,15 +107,11 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic -LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" -Iart +LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" 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 \ - sigchain_proxy.cpp + main_surfaceflinger.cpp LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger \ @@ -125,6 +121,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libdl +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_MODULE:= surfaceflinger ifdef TARGET_32_BIT_SURFACEFLINGER |