diff options
author | Reynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk> | 2011-10-17 18:01:29 -0300 |
---|---|---|
committer | Reynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk> | 2011-10-17 19:00:26 -0300 |
commit | 05f5316897a4a22dbc4608456680d424e6d0ae05 (patch) | |
tree | 2e2a764c27f7d969527668e953ea0d203da40e9e | |
parent | 2db009a056c72032b323b80640ccc68aa2f2a1c0 (diff) |
Cosmetics
-rw-r--r-- | sink/audioflingersink/Android.mk | 46 | ||||
-rw-r--r-- | sink/surfaceflingersink/Android.mk | 42 |
2 files changed, 43 insertions, 45 deletions
diff --git a/sink/audioflingersink/Android.mk b/sink/audioflingersink/Android.mk index 95feb5b..60eaf13 100644 --- a/sink/audioflingersink/Android.mk +++ b/sink/audioflingersink/Android.mk @@ -1,20 +1,20 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) # ------------------------------------- # gstaudioflinger library # include $(CLEAR_VARS) - + LOCAL_ARM_MODE := arm gstaudioflinger_FILES := \ - audioflinger_wrapper.cpp \ - gstaudioflingersink.c \ - GstAndroid.cpp + audioflinger_wrapper.cpp \ + gstaudioflingersink.c \ + GstAndroid.cpp LOCAL_SRC_FILES := $(gstaudioflinger_FILES) LOCAL_C_INCLUDES = $(LOCAL_PATH) \ - $(LOCAL_PATH)/include + $(LOCAL_PATH)/include ifneq ($(NDK_BUILD), true) LOCAL_C_INCLUDES += $(TOP)/frameworks/base @@ -25,8 +25,8 @@ endif LOCAL_CFLAGS += -DHAVE_CONFIG_H LOCAL_CFLAGS += -Wall -Wdeclaration-after-statement -g -O2 LOCAL_CFLAGS += -DANDROID_USE_GSTREAMER \ - $(shell $(PKG_CONFIG) gstreamer-plugins-bad-0.10 --cflags) \ - $(shell $(PKG_CONFIG) gstreamer-audio-0.10 --cflags) + $(shell $(PKG_CONFIG) gstreamer-plugins-bad-0.10 --cflags) \ + $(shell $(PKG_CONFIG) gstreamer-audio-0.10 --cflags) ifeq ($(USE_AUDIO_PURE_CODEC),true) LOCAL_CFLAGS += -DAUDIO_PURE_CODEC @@ -34,14 +34,14 @@ endif LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstvideo-0.10 \ - libgstaudio-0.10 + libgstreamer-0.10 \ + libgstbase-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstvideo-0.10 \ + libgstaudio-0.10 ifneq ($(NDK_BUILD), true) LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog @@ -50,12 +50,12 @@ LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib -llog -lmedia -laudioflinger -lutils endif LOCAL_SHARED_LIBRARIES += \ - libutils \ - libcutils \ - libui \ - libhardware \ - libandroid_runtime \ - libmedia + libutils \ + libcutils \ + libui \ + libhardware \ + libandroid_runtime \ + libmedia LOCAL_MODULE:= libgstaudioflinger @@ -64,7 +64,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 # # define LOCAL_PRELINK_MODULE to false to not use pre-link map # -LOCAL_PRELINK_MODULE := false +LOCAL_PRELINK_MODULE := false LOCAL_MODULE_TAGS := eng debug include $(BUILD_SHARED_LIBRARY) diff --git a/sink/surfaceflingersink/Android.mk b/sink/surfaceflingersink/Android.mk index 2073d2b..818ed6d 100644 --- a/sink/surfaceflingersink/Android.mk +++ b/sink/surfaceflingersink/Android.mk @@ -1,32 +1,30 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - surfaceflinger_wrap.cpp \ - gstsurfaceflingersink.c - + surfaceflinger_wrap.cpp \ + gstsurfaceflingersink.c + LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstbase-0.10 \ - libgstvideo-0.10 \ - libcutils \ - libutils \ - libui \ - libsurfaceflinger \ - libsurfaceflinger_client \ - libbinder + libgstreamer-0.10 \ + libglib-2.0 \ + libgthread-2.0 \ + libgmodule-2.0 \ + libgobject-2.0 \ + libgstbase-0.10 \ + libgstvideo-0.10 \ + libcutils \ + libutils \ + libui \ + libsurfaceflinger \ + libsurfaceflinger_client \ + libbinder LOCAL_MODULE:= libgstsurfaceflinger -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../ +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../ ifneq ($(NDK_BUILD), true) LOCAL_C_INCLUDES += frameworks/base/include @@ -35,8 +33,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../android_headers endif LOCAL_CFLAGS := -DANDROID_USE_GSTREAMER \ - -DHAVE_CONFIG_H \ - $(shell $(PKG_CONFIG) gstreamer-video-0.10 --cflags) + -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 |