diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk> | 2011-10-17 17:32:49 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk> | 2011-10-17 18:59:07 -0300 |
| commit | 2db009a056c72032b323b80640ccc68aa2f2a1c0 (patch) | |
| tree | e004c3e876a95588c88e978113b83bc5d527fe3d | |
| parent | 717d6643708af47cb81d9f212ad8683d29d8d32a (diff) | |
Fix building with the NDK
These changes apply only to NDK builds:
- Disable building of everything but audioflingersink for now.
- Avoid trying to include $(TOP)/frameworks/base as it's not required for building.
- Added needed CF_LAGS / LD_FLAGS everywhere.
- Rely on local copy of needed (but not bundled) Android headers under gst-android/android_headers.
- Rely on local copies of needed (but not bundled) Android shared libraries on linker path.
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | sink/audioflingersink/Android.mk | 13 | ||||
| -rw-r--r-- | sink/surfaceflingersink/Android.mk | 13 |
3 files changed, 26 insertions, 4 deletions
@@ -6,6 +6,10 @@ GST_ANDROID_TOP := $(LOCAL_PATH) include $(CLEAR_VARS) +ifneq ($(NDK_BUILD), true) include $(GST_ANDROID_TOP)/gstplayer/Android.mk include $(GST_ANDROID_TOP)/sink/audioflingersink/Android.mk include $(GST_ANDROID_TOP)/sink/surfaceflingersink/Android.mk +else +include $(GST_ANDROID_TOP)/sink/audioflingersink/Android.mk +endif diff --git a/sink/audioflingersink/Android.mk b/sink/audioflingersink/Android.mk index 89955f8..95feb5b 100644 --- a/sink/audioflingersink/Android.mk +++ b/sink/audioflingersink/Android.mk @@ -14,8 +14,13 @@ gstaudioflinger_FILES := \ LOCAL_SRC_FILES := $(gstaudioflinger_FILES) LOCAL_C_INCLUDES = $(LOCAL_PATH) \ - $(LOCAL_PATH)/include \ - $(TOP)/frameworks/base + $(LOCAL_PATH)/include + +ifneq ($(NDK_BUILD), true) +LOCAL_C_INCLUDES += $(TOP)/frameworks/base +else +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../android_headers +endif LOCAL_CFLAGS += -DHAVE_CONFIG_H LOCAL_CFLAGS += -Wall -Wdeclaration-after-statement -g -O2 @@ -38,7 +43,11 @@ LOCAL_SHARED_LIBRARIES += \ libgstvideo-0.10 \ libgstaudio-0.10 +ifneq ($(NDK_BUILD), true) LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog +else +LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog -lmedia -laudioflinger -lutils +endif LOCAL_SHARED_LIBRARIES += \ libutils \ diff --git a/sink/surfaceflingersink/Android.mk b/sink/surfaceflingersink/Android.mk index 4c9f422..2073d2b 100644 --- a/sink/surfaceflingersink/Android.mk +++ b/sink/surfaceflingersink/Android.mk @@ -26,13 +26,22 @@ LOCAL_MODULE:= libgstsurfaceflinger LOCAL_C_INCLUDES := \ $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../ \ - frameworks/base/include + $(LOCAL_PATH)/../../ + +ifneq ($(NDK_BUILD), true) +LOCAL_C_INCLUDES += frameworks/base/include +else +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../android_headers +endif LOCAL_CFLAGS := -DANDROID_USE_GSTREAMER \ -DHAVE_CONFIG_H \ $(shell $(PKG_CONFIG) gstreamer-video-0.10 --cflags) +ifeq ($(NDK_BUILD), true) +LOCAL_LDFLAGS := -lmediaplayerservice -lsurfaceflinger -lsurfaceflinger_client -lmedia -lpixelflinger -lui -lbinder -lhardware -lcutils -lutils +endif + LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 LOCAL_PRELINK_MODULE := false LOCAL_MODULE_TAGS := eng debug |