tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 933dc059: am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."

Browse source 
Merge commit '933dc05929fba064286bd43a7c72c7d4e1775582'

* commit '933dc05929fba064286bd43a7c72c7d4e1775582':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.
This commit is contained in:
Jean-Baptiste Queru 2010-08-17 07:51:26 -07:00 committed by Android Git Automerger
commit aa3061dab6
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libpixelflinger/Android.mk
View file

@ -1,17 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
#
# ARMv6 specific objects
#
ifeq ($(TARGET_ARCH),arm)
LOCAL_ASFLAGS := -march=armv6
LOCAL_SRC_FILES := rotate90CW_4x4_16v6.S
LOCAL_MODULE := libpixelflinger_armv6
include $(BUILD_STATIC_LIBRARY)
endif
#
# C/C++ and ARMv5 objects
#
@ -77,10 +66,6 @@ ifneq ($(BUILD_TINY_ANDROID),true)
LOCAL_SHARED_LIBRARIES += libhardware_legacy
LOCAL_CFLAGS += -DWITH_LIB_HARDWARE
endif
ifeq ($(TARGET_ARCH),arm)
LOCAL_WHOLE_STATIC_LIBRARIES := libpixelflinger_armv6
endif
include $(BUILD_SHARED_LIBRARY)
#
@ -91,9 +76,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libpixelflinger_static
LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
ifeq ($(TARGET_ARCH),arm)
LOCAL_WHOLE_STATIC_LIBRARIES := libpixelflinger_armv6
endif
include $(BUILD_STATIC_LIBRARY)