diff options
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 7d7bd7d..8948abb 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -57,7 +57,6 @@ LOCAL_SRC_FILES:= \ avc_utils.cpp \ LOCAL_C_INCLUDES:= \ - $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/include/media/stagefright/timedtext \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax \ @@ -69,7 +68,6 @@ LOCAL_C_INCLUDES:= \ LOCAL_SHARED_LIBRARIES := \ libbinder \ libcamera_client \ - libchromium_net \ libcrypto \ libcutils \ libdl \ @@ -102,14 +100,18 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_httplive \ libstagefright_id3 \ libFLAC \ - libstagefright_chromium_http \ + +ifneq ($(TARGET_BUILD_PDK), true) +LOCAL_STATIC_LIBRARIES += \ + libstagefright_chromium_http +LOCAL_SHARED_LIBRARIES += \ + libchromium_net +LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 +endif LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk -# TODO: Chromium is always available, so this flag can be removed. -LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 - LOCAL_SHARED_LIBRARIES += \ libstagefright_enc_common \ libstagefright_avc_common \ |