Loading cmds/app_process/Android.mk +7 −10 Original line number Diff line number Diff line Loading @@ -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 \ Loading @@ -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 Loading @@ -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 \ Loading @@ -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 Loading cmds/app_process/sigchain_proxy.cppdeleted 100644 → 0 +0 −17 Original line number Diff line number Diff line /* * 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" Loading
cmds/app_process/Android.mk +7 −10 Original line number Diff line number Diff line Loading @@ -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 \ Loading @@ -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 Loading @@ -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 \ Loading @@ -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 Loading
cmds/app_process/sigchain_proxy.cppdeleted 100644 → 0 +0 −17 Original line number Diff line number Diff line /* * 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"
