From 84c18d6459635099d52b63009ef5a007891c4fb6 Mon Sep 17 00:00:00 2001 From: Jianhong Jiang Date: Mon, 13 Apr 2009 19:01:51 -0700 Subject: Squashed commit of the following: commit b6cf47306b642f7cf7e1b55cce448e0deff38f36 Author: Jianhong Jiang Date: Mon Apr 13 11:07:01 2009 -0700 Change tabs into 4 spaces. commit 93c5890dbcc68e37aa0ef039b4a203acddca8968 Author: Jianhong Jiang Date: Fri Apr 10 14:15:23 2009 -0700 OpenCore 2.02 related changes. --- media/libmediaplayerservice/Android.mk | 40 ++++++++++++---------------------- 1 file changed, 14 insertions(+), 26 deletions(-) (limited to 'media/libmediaplayerservice/Android.mk') diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 0478234..f7f2490 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -7,40 +7,28 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - MediaPlayerService.cpp \ - MetadataRetrieverClient.cpp \ - VorbisPlayer.cpp \ - MidiFile.cpp - -ifneq ($(BUILD_WITHOUT_PV),true) -LOCAL_SRC_FILES+= \ - MediaRecorderClient.cpp -endif + MediaRecorderClient.cpp \ + MediaPlayerService.cpp \ + MetadataRetrieverClient.cpp \ + VorbisPlayer.cpp \ + MidiFile.cpp ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread endif LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libvorbisidec \ - libsonivox \ - libmedia \ - libandroid_runtime - -ifneq ($(BUILD_WITHOUT_PV),true) -LOCAL_SHARED_LIBRARIES += \ - libopencoreplayer \ - libopencoreauthor -endif + libcutils \ + libutils \ + libvorbisidec \ + libsonivox \ + libopencore_player \ + libopencore_author \ + libmedia \ + libandroid_runtime LOCAL_C_INCLUDES := external/tremor/Tremor \ - $(call include-path-for, graphics corecg) - -ifeq ($(BUILD_WITHOUT_PV),true) -LOCAL_CFLAGS := -DNO_OPENCORE -endif + $(call include-path-for, graphics corecg) LOCAL_MODULE:= libmediaplayerservice -- cgit v1.1