diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-07 13:40:41 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-16 11:43:19 -0700 |
| commit | 2b1f2dac939a035475f7b0c3c3a976de4384bb98 (patch) | |
| tree | 29dcb6c5bbbd5e7f1b56281b65d90ed57b393555 /services | |
| parent | 91c395f6c344682f1ae5926766d4d7247dee6df4 (diff) | |
| download | frameworks_native-2b1f2dac939a035475f7b0c3c3a976de4384bb98.zip frameworks_native-2b1f2dac939a035475f7b0c3c3a976de4384bb98.tar.gz frameworks_native-2b1f2dac939a035475f7b0c3c3a976de4384bb98.tar.bz2 | |
Link sigchain to surfaceflinger main executable
And export necessary symbols to preempt calls from libart.so
Bug: 15345057
Bug: 15426766
(cherry picked from commit f3da24d8cf02d7c74ff7c24eae0154a21a192fda)
Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
Diffstat (limited to 'services')
| -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" |