diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 18:21:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 18:21:49 +0000 |
| commit | 7f05e9118bd9b91a18994d5757ca372b05bd732c (patch) | |
| tree | a4e6cbeae34e1eacea400015729376752d85cb30 /cmds/app_process | |
| parent | 21bb71e4d8f088a2716eb11d948f88bd65748bfc (diff) | |
| parent | d1e735ef547c1720aa5bb56a446afbb7a8652599 (diff) | |
| download | frameworks_base-7f05e9118bd9b91a18994d5757ca372b05bd732c.zip frameworks_base-7f05e9118bd9b91a18994d5757ca372b05bd732c.tar.gz frameworks_base-7f05e9118bd9b91a18994d5757ca372b05bd732c.tar.bz2 | |
am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable"
* commit 'd1e735ef547c1720aa5bb56a446afbb7a8652599':
Link sigchain to main executable
Diffstat (limited to 'cmds/app_process')
| -rw-r--r-- | cmds/app_process/Android.mk | 17 | ||||
| -rw-r--r-- | cmds/app_process/sigchain_proxy.cpp | 17 |
2 files changed, 32 insertions, 2 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index 74a2f7b..1ca14a6 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -2,10 +2,18 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +# 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:= \ - app_main.cpp + app_main.cpp \ + sigchain_proxy.cpp + +LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic +LOCAL_CPPFLAGS := -std=c++11 -Iart LOCAL_SHARED_LIBRARIES := \ + libdl \ libcutils \ libutils \ liblog \ @@ -28,8 +36,10 @@ ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) +# see comment above (~l5) LOCAL_SRC_FILES:= \ - app_main.cpp + app_main.cpp \ + sigchain_proxy.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -38,6 +48,9 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime +LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic +LOCAL_CPPFLAGS := -std=c++11 -Iart + LOCAL_MODULE := app_process__asan LOCAL_MODULE_TAGS := eng LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan diff --git a/cmds/app_process/sigchain_proxy.cpp b/cmds/app_process/sigchain_proxy.cpp new file mode 100644 index 0000000..bb7a678 --- /dev/null +++ b/cmds/app_process/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" |