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

Commit 10cf121f authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "Update make file" into jb-dev

parents b7706712 c68f4a22
Loading
Loading
Loading
Loading
+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
+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