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

Commit 8f1dd6fd authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am 10cf121f: Merge "Update make file" into jb-dev 

* commit '10cf121f':
  Update make file
parents c6a957fc 10cf121f

media/libstagefright/codecs/aacdec/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ ifeq ($(AAC_LIBRARY), fraunhofer) 


  LOCAL_CFLAGS :=



  LOCAL_STATIC_LIBRARIES := \

          libAACdec libMpegTPDec libSBRdec libPCMutils libFDK libSYS

  LOCAL_STATIC_LIBRARIES := libFraunhoferAAC



  LOCAL_SHARED_LIBRARIES := \

          libstagefright_omx libstagefright_foundation libutils libcutils

media/libstagefright/codecs/aacenc/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -108,8 +108,7 @@ ifeq ($(AAC_LIBRARY), fraunhofer) 


  LOCAL_CFLAGS :=



  LOCAL_STATIC_LIBRARIES := \

          libAACenc libMpegTPEnc libSBRenc libFDK libSYS

  LOCAL_STATIC_LIBRARIES := libFraunhoferAAC



  LOCAL_SHARED_LIBRARIES := \

          libstagefright_omx libstagefright_foundation libutils