diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 07:48:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 07:48:41 -0700 |
| commit | 933dc05929fba064286bd43a7c72c7d4e1775582 (patch) | |
| tree | 848c784f5d5b6770a11b732968ab2c9cea8d669e /libpixelflinger | |
| parent | 7caef0c70f51a4863969a537c5d5e954483304f6 (diff) | |
| parent | 4ea1a52b1bbbd6e78c5909c75d773416108f5b84 (diff) | |
| download | system_core-933dc05929fba064286bd43a7c72c7d4e1775582.zip system_core-933dc05929fba064286bd43a7c72c7d4e1775582.tar.gz system_core-933dc05929fba064286bd43a7c72c7d4e1775582.tar.bz2 | |
am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."
Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp
* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
libpixelflinger: ARMv6 specific objects are not used. Remove.
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 6491d24..ed2ab5e 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -2,17 +2,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) |