Skip to content

Commit

Permalink
Disabling build of SurfaceFlinger executable.
Browse files Browse the repository at this point in the history
Build fails because it requires libsigchain library which is part of ART which we don't want to pull in.
Beside we don't really need surfaceflinger executable, unless for some test in which case we can enable it manually.

Change-Id: I2ec821fc60159dab0815491b6b596dded3a433ae
  • Loading branch information
kubiko authored and mariogrip committed Nov 2, 2015
1 parent 52cd72f commit 6911d6a
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions services/surfaceflinger/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -129,32 +129,32 @@ include $(BUILD_SHARED_LIBRARY)

###############################################################
# build surfaceflinger's executable
include $(CLEAR_VARS)

LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_CPPFLAGS:= -std=c++11

LOCAL_SRC_FILES:= \
main_surfaceflinger.cpp

LOCAL_SHARED_LIBRARIES := \
libsurfaceflinger \
libcutils \
liblog \
libbinder \
libutils \
libdl

LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain

LOCAL_MODULE:= surfaceflinger

ifdef TARGET_32_BIT_SURFACEFLINGER
LOCAL_32_BIT_ONLY := true
endif

include $(BUILD_EXECUTABLE)
# include $(CLEAR_VARS)
#
# LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
# LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
# LOCAL_CPPFLAGS:= -std=c++11
#
# LOCAL_SRC_FILES:= \
# main_surfaceflinger.cpp
#
# LOCAL_SHARED_LIBRARIES := \
# libsurfaceflinger \
# libcutils \
# liblog \
# libbinder \
# libutils \
# libdl
#
# LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
#
# LOCAL_MODULE:= surfaceflinger
#
# ifdef TARGET_32_BIT_SURFACEFLINGER
# LOCAL_32_BIT_ONLY := true
# endif
#
# include $(BUILD_EXECUTABLE)

###############################################################
# uses jni which may not be available in PDK
Expand Down

0 comments on commit 6911d6a

Please sign in to comment.