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

Commit c2522525 authored by The Android Automerger's avatar The Android Automerger
Browse files

Revert "Revert "Revert to PV for AAC codec for FactoryROM."" 

This reverts commit c9ef89cd.
parent 461efc50

media/libstagefright/codecs/aacdec/Android.mk

+2 −2
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



AAC_LIBRARY = fraunhofer

AAC_LIBRARY = pv



ifeq ($(AAC_LIBRARY), fraunhofer)

ifneq ($(AAC_LIBRARY), pv)

  include $(CLEAR_VARS)



  LOCAL_SRC_FILES := \

media/libstagefright/codecs/aacenc/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)

include frameworks/av/media/libstagefright/codecs/common/Config.mk



AAC_LIBRARY = fraunhofer

AAC_LIBRARY = visualon



LOCAL_SRC_FILES := basic_op/basicop2.c basic_op/oper_32b.c
@@ -90,7 +90,7 @@ include $(BUILD_STATIC_LIBRARY) 


include $(CLEAR_VARS)



ifeq ($(AAC_LIBRARY), fraunhofer)

ifneq ($(AAC_LIBRARY), visualon)



  include $(CLEAR_VARS)