diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-19 10:43:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 10:43:22 -0700 |
| commit | 1345ef0f49f83f37953e6d30616611a92294144a (patch) | |
| tree | 66f1d6f9eb6fc31073faa3699789e9cd08c19993 /media/libstagefright | |
| parent | eee7f9dd0d3410877dd58a14c4b80aacbeb32d72 (diff) | |
| parent | 05cd06e19f968c7320e8e85fc7122125f284741c (diff) | |
| download | frameworks_av-1345ef0f49f83f37953e6d30616611a92294144a.zip frameworks_av-1345ef0f49f83f37953e6d30616611a92294144a.tar.gz frameworks_av-1345ef0f49f83f37953e6d30616611a92294144a.tar.bz2 | |
Merge "Revert "Temporary revert of new AAC codec to fix build""
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk index 2808745..b7c3788 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH:= $(call my-dir) -AAC_LIBRARY = pv +AAC_LIBRARY = fraunhofer ifeq ($(AAC_LIBRARY), fraunhofer) include $(CLEAR_VARS) |