diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-20 14:17:26 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-12-10 10:28:50 -0800 |
| commit | e9b6f1f7bb590a3f9845a150c1e9286c8ad48bfe (patch) | |
| tree | 3a621aad409bd3d4c5c7da8b3e9634602b54da28 | |
| parent | e329be2e0004216474fe0545ab7a2cb1863d387a (diff) | |
| download | native-e9b6f1f7bb590a3f9845a150c1e9286c8ad48bfe.tar.gz | |
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
(cherry picked from commit 4340a14fbfe761a46e7a655b568cbd0953773df3)
Bug: 18701723
Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a
| -rw-r--r-- | services/surfaceflinger/Android.mk | 10 | ||||
| -rw-r--r-- | services/surfaceflinger/sigchain_proxy.cpp | 17 |
2 files changed, 4 insertions, 23 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 76545f3775..eade2e2210 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -115,15 +115,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 \ @@ -133,6 +129,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libdl +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_MODULE:= surfaceflinger ifdef TARGET_32_BIT_SURFACEFLINGER diff --git a/services/surfaceflinger/sigchain_proxy.cpp b/services/surfaceflinger/sigchain_proxy.cpp deleted file mode 100644 index bb7a678d2b..0000000000 --- a/services/surfaceflinger/sigchain_proxy.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "sigchainlib/sigchain.cc" |