diff options
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index cf97b23..ecd1d2e 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -13,7 +13,8 @@ LOCAL_SRC_FILES:= \ TestPlayerStub.cpp \ VorbisPlayer.cpp \ VorbisMetadataRetriever.cpp \ - MidiMetadataRetriever.cpp \ + FLACPlayer.cpp \ + MidiMetadataRetriever.cpp \ MidiFile.cpp ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) @@ -40,12 +41,17 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libstagefright \ libstagefright_omx \ - libstagefright_color_conversion \ - libsurfaceflinger_client + libstagefright_color_conversion + +ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true) + LOCAL_SHARED_LIBRARIES += \ + libsurfaceflinger_client +endif ifneq ($(BUILD_WITHOUT_PV),true) LOCAL_SHARED_LIBRARIES += \ libopencore_player \ + libFLAC \ libopencore_author else LOCAL_CFLAGS += -DNO_OPENCORE @@ -56,6 +62,7 @@ LOCAL_SHARED_LIBRARIES += libdl endif LOCAL_C_INCLUDES := \ + external/flac/include \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ |