From 4340a14fbfe761a46e7a655b568cbd0953773df3 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Mon, 20 Oct 2014 14:17:26 -0700 Subject: [PATCH] Switch to libsigchain.a Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker to export symbols from the static library. Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2 --- services/surfaceflinger/Android.mk | 10 ++++------ services/surfaceflinger/sigchain_proxy.cpp | 17 ----------------- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 services/surfaceflinger/sigchain_proxy.cpp diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 3416e48e4..b0b13e761 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 diff --git a/services/surfaceflinger/sigchain_proxy.cpp b/services/surfaceflinger/sigchain_proxy.cpp deleted file mode 100644 index bb7a678d2..000000000 --- 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"