diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-21 03:30:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 03:30:55 +0000 |
| commit | 8b81ce563f03500064e0f4c87288b8eeb3bed496 (patch) | |
| tree | 9bdef25b554a734604437b34f9058b8a3ffb7786 /services | |
| parent | 54d613e33c3c93382ac846509967bac2faf72047 (diff) | |
| parent | cb8a9fcc56288378d05d80c55396db7981e3828d (diff) | |
| download | frameworks_native-8b81ce563f03500064e0f4c87288b8eeb3bed496.zip frameworks_native-8b81ce563f03500064e0f4c87288b8eeb3bed496.tar.gz frameworks_native-8b81ce563f03500064e0f4c87288b8eeb3bed496.tar.bz2 | |
am cb8a9fcc: Merge "Switch to libsigchain.a"
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
Diffstat (limited to 'services')
| -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 57e94ef..a273c96 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -109,15 +109,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 \ @@ -127,6 +123,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 bb7a678..0000000 --- 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" |