diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
| commit | e1a2df553a6d151807a5da738a3cd853bef908d9 (patch) | |
| tree | 9015c1c9ad9ec69f1962657f70fe3df386fbb05a /media/libstagefright/codecs/aacdec/Android.mk | |
| parent | bcf093bfef277a8ec0119da9e84e5abac58ad0b1 (diff) | |
| parent | 841daebc75fbf5e7fb4dd71cab559b8f4d7150ae (diff) | |
| download | frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.zip frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.gz frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.bz2 | |
Resolve conflict
Diffstat (limited to 'media/libstagefright/codecs/aacdec/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk index ffa64f9..afb00aa 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -3,7 +3,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - SoftAAC2.cpp + SoftAAC2.cpp \ + DrcPresModeWrap.cpp LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ @@ -17,6 +18,8 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := +LOCAL_CFLAGS += -Werror + LOCAL_STATIC_LIBRARIES := libFraunhoferAAC LOCAL_SHARED_LIBRARIES := \ |