diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 19:05:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 19:05:26 +0000 |
| commit | 86636a988f6a3bd52d4c8a29ae4ed71ec4e7eae3 (patch) | |
| tree | cd40e899332f7e5ef4b2b0f6f2091c22b3059d02 | |
| parent | 27d0e598fda4d619998e536636dc43220728f679 (diff) | |
| parent | 88e5118f07f38c96d5b438a44c42b0951c65ba0d (diff) | |
| download | frameworks_native-86636a988f6a3bd52d4c8a29ae4ed71ec4e7eae3.zip frameworks_native-86636a988f6a3bd52d4c8a29ae4ed71ec4e7eae3.tar.gz frameworks_native-86636a988f6a3bd52d4c8a29ae4ed71ec4e7eae3.tar.bz2 | |
am 88e5118f: am 26a28149: Merge "Link sigchain to surfaceflinger main executable"
* commit '88e5118f07f38c96d5b438a44c42b0951c65ba0d':
Link sigchain to surfaceflinger main executable
| -rw-r--r-- | services/surfaceflinger/Android.mk | 13 | ||||
| -rw-r--r-- | services/surfaceflinger/sigchain_proxy.cpp | 17 |
2 files changed, 27 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 diff --git a/services/surfaceflinger/sigchain_proxy.cpp b/services/surfaceflinger/sigchain_proxy.cpp new file mode 100644 index 0000000..bb7a678 --- /dev/null +++ b/services/surfaceflinger/sigchain_proxy.cpp @@ -0,0 +1,17 @@ +/* + * 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" |