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

Commit 9219bfc4 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" 

* commit '2ad7af29':
  Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
parents 3a46b975 2ad7af29

media/libstagefright/codecs/common/Config.mk

+4 −2
Original line number Diff line number Diff line
@@ -14,9 +14,11 @@ VOTT := pc 
endif



# Do we also need to check on ARCH_ARM_HAVE_ARMV7A? - probably not

ifeq ($(TARGET_ARCH),arm)

  ifeq ($(ARCH_ARM_HAVE_NEON),true)

    VOTT := v7

  endif

endif



VOTEST := 0

media/libstagefright/codecs/on2/h264dec/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ MY_OMXDL_ASM_SRC := \ 
	./omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S \

	./omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S \





ifeq ($(TARGET_ARCH),arm)

  ifeq ($(ARCH_ARM_HAVE_NEON),true)

    LOCAL_ARM_NEON   := true

#    LOCAL_CFLAGS     := -std=c99 -D._NEON -D._OMXDL
@@ -95,6 +95,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true) 
                        $(LOCAL_PATH)/./omxdl/arm_neon/vc/api \

                        $(LOCAL_PATH)/./omxdl/arm_neon/vc/m4p10/api

  endif

endif



LOCAL_SHARED_LIBRARIES := \

	libstagefright libstagefright_omx libstagefright_foundation libutils liblog \