diff options
| author | Colin Cross <ccross@android.com> | 2012-03-24 14:06:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-26 12:24:52 -0700 |
| commit | 4116807a35a27abf635bf6199ed9ad8703c9e94d (patch) | |
| tree | fd64c0f10fb7bed1db462b72f4f10dc437169367 /media/libstagefright | |
| parent | 15147270aa1c56503902b424f946389294875665 (diff) | |
| download | frameworks_av-4116807a35a27abf635bf6199ed9ad8703c9e94d.zip frameworks_av-4116807a35a27abf635bf6199ed9ad8703c9e94d.tar.gz frameworks_av-4116807a35a27abf635bf6199ed9ad8703c9e94d.tar.bz2 | |
stagefright: compile without chromium for pdk builds
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 13 | ||||
| -rw-r--r-- | media/libstagefright/chromium_http/Android.mk | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 65a947a..8948abb 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -68,7 +68,6 @@ LOCAL_C_INCLUDES:= \ LOCAL_SHARED_LIBRARIES := \ libbinder \ libcamera_client \ - libchromium_net \ libcrypto \ libcutils \ libdl \ @@ -101,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 \ diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index 6d5dcfb..d595686 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH:= $(call my-dir) +ifneq ($(TARGET_BUILD_PDK), true) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ @@ -21,3 +22,4 @@ include external/stlport/libstlport.mk LOCAL_MODULE:= libstagefright_chromium_http include $(BUILD_STATIC_LIBRARY) +endif |