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

Commit 2308fef4 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode"

parents 9ff63ce5 d285415e

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/target/common/obj/APPS/Music2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/INdefTag.java)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libstagefright_aacdec_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libstagefright_mp3dec_intermediates)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

media/libstagefright/codecs/aacdec/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO -DOSCL_IMPORT_REF= -DOSCL 


LOCAL_C_INCLUDES := frameworks/base/media/libstagefright/include



LOCAL_ARM_MODE := arm



LOCAL_MODULE := libstagefright_aacdec



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/mp3dec/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -53,5 +53,7 @@ LOCAL_CFLAGS := \ 


LOCAL_MODULE := libstagefright_mp3dec



LOCAL_ARM_MODE := arm



include $(BUILD_STATIC_LIBRARY)