Merge "libpixelflinger: ARMv6 specific objects are not used. Remove." (4ea1a52b) · Commits · e / os / android_system_core

libpixelflinger/Android.mk

+0 −18

Original line number	Diff line number	Diff line
		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)