Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 933dc059 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit '4ea1a52b' into gingerbread-plus-aosp

* commit '4ea1a52b':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.
parents 7caef0c7 4ea1a52b

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)