diff options
| author | Marco Nelissen <marcone@google.com> | 2015-02-11 01:51:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 01:51:25 +0000 |
| commit | 10d211b84a5f0790b28fcc8b3db66884d5f9c729 (patch) | |
| tree | f3b50f75ce127b2c6f89675ba3bf4ea255983451 | |
| parent | 28e448bb5533d14f9a2c39bd71a73e0062fc5c49 (diff) | |
| parent | 1c6ab7db30867f3eee0d550adb015b340fbbc668 (diff) | |
| download | fdk-aac-10d211b84a5f0790b28fcc8b3db66884d5f9c729.tar.gz fdk-aac-10d211b84a5f0790b28fcc8b3db66884d5f9c729.tar.bz2 fdk-aac-10d211b84a5f0790b28fcc8b3db66884d5f9c729.zip | |
am 1c6ab7db: Merge "Use gcc for the AAC decoder"
* commit '1c6ab7db30867f3eee0d550adb015b340fbbc668':
Use gcc for the AAC decoder
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -57,4 +57,6 @@ LOCAL_CPPFLAGS += -std=c++98 LOCAL_MODULE:= libFraunhoferAAC +LOCAL_CLANG:= false + include $(BUILD_STATIC_LIBRARY) |