Loading services/surfaceflinger/Android.mk +4 −6 Original line number Diff line number Diff line Loading @@ -109,15 +109,11 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" -Iart LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" 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 \ sigchain_proxy.cpp main_surfaceflinger.cpp LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger \ Loading @@ -127,6 +123,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libdl LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain LOCAL_MODULE:= surfaceflinger ifdef TARGET_32_BIT_SURFACEFLINGER Loading services/surfaceflinger/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
services/surfaceflinger/Android.mk +4 −6 Original line number Diff line number Diff line Loading @@ -109,15 +109,11 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" -Iart LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" 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 \ sigchain_proxy.cpp main_surfaceflinger.cpp LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger \ Loading @@ -127,6 +123,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libdl LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain LOCAL_MODULE:= surfaceflinger ifdef TARGET_32_BIT_SURFACEFLINGER Loading
services/surfaceflinger/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"
