diff options
| author | Dave Burke <daveburke@google.com> | 2012-06-12 12:23:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-12 12:23:20 -0700 |
| commit | 10cf121f7285e23c37264dab3bad7cffefd754b1 (patch) | |
| tree | c627048a3a4bd71a7d73c5993d52960c6921261b | |
| parent | b7706712938c55706c87724af7f6d2f2156b8d1b (diff) | |
| parent | c68f4a226fc5af54a882b0603d3051793a781037 (diff) | |
Merge "Update make file" into jb-dev
| -rw-r--r-- | media/libstagefright/codecs/aacdec/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/Android.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk index 1b2544a1..91457c58 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -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 diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 98e702ec..1c342c8b 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -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 |