diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-21 03:29:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 03:29:46 +0000 |
| commit | a0d07d49b8b0aae71beb48ec31b43f6923530d00 (patch) | |
| tree | 823e7a702793c44562361155b8e9690df2b41479 /cmds/app_process | |
| parent | e55300b14a20458da284cac981514bd01b345559 (diff) | |
| parent | 9be7db6e3bc374efd9dcff744deab92148e20dbd (diff) | |
| download | frameworks_base-a0d07d49b8b0aae71beb48ec31b43f6923530d00.zip frameworks_base-a0d07d49b8b0aae71beb48ec31b43f6923530d00.tar.gz frameworks_base-a0d07d49b8b0aae71beb48ec31b43f6923530d00.tar.bz2 | |
am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a"
* commit '9be7db6e3bc374efd9dcff744deab92148e20dbd':
Switch to libsigchain.a
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, 7 insertions, 27 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index 1ca14a6..397a7d1 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -2,15 +2,10 @@ 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 \ - sigchain_proxy.cpp + app_main.cpp LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic -LOCAL_CPPFLAGS := -std=c++11 -Iart LOCAL_SHARED_LIBRARIES := \ libdl \ @@ -20,6 +15,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_MODULE:= app_process LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := app_process32 @@ -36,10 +33,8 @@ ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) -# see comment above (~l5) LOCAL_SRC_FILES:= \ - app_main.cpp \ - sigchain_proxy.cpp + app_main.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -48,8 +43,10 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic -LOCAL_CPPFLAGS := -std=c++11 -Iart +LOCAL_CPPFLAGS := -std=c++11 LOCAL_MODULE := app_process__asan LOCAL_MODULE_TAGS := eng diff --git a/cmds/app_process/sigchain_proxy.cpp b/cmds/app_process/sigchain_proxy.cpp deleted file mode 100644 index bb7a678..0000000 --- a/cmds/app_process/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" |