ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am 88e5118f: am 26a28149: Merge "Link sigchain to surfaceflinger main executable"

Browse Source 
* commit '88e5118f07f38c96d5b438a44c42b0951c65ba0d':
  Link sigchain to surfaceflinger main executable
This commit is contained in:
Dmitriy Ivanov 2014-10-14 19:05:26 +00:00 committed by Android Git Automerger
commit 86636a988f
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/surfaceflinger/Android.mk
View File

@ -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

17
services/surfaceflinger/sigchain_proxy.cpp Normal file
View File

@ -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"