From 5e0067b486c3862316aa1f293cf9690c0cf54bda Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 11 Jul 2011 22:12:16 -0700 Subject: Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8 --- media/libeffects/factory/Android.mk | 8 -------- media/libeffects/lvm/wrapper/Android.mk | 14 ++------------ media/libeffects/visualizer/Android.mk | 11 ++--------- media/libmedia/Android.mk | 10 +--------- media/libmediaplayerservice/Android.mk | 11 ++--------- media/libstagefright/Android.mk | 17 +---------------- media/libstagefright/chromium_http/Android.mk | 2 -- media/libstagefright/omx/Android.mk | 9 +-------- media/mtp/Android.mk | 4 ---- 9 files changed, 9 insertions(+), 77 deletions(-) (limited to 'media') diff --git a/media/libeffects/factory/Android.mk b/media/libeffects/factory/Android.mk index 20f58e5..26265ae 100644 --- a/media/libeffects/factory/Android.mk +++ b/media/libeffects/factory/Android.mk @@ -12,14 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_MODULE:= libeffects -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif - -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl -endif - -LOCAL_C_INCLUDES := \ include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk index ab13605..f097dd0 100644 --- a/media/libeffects/lvm/wrapper/Android.mk +++ b/media/libeffects/lvm/wrapper/Android.mk @@ -19,12 +19,7 @@ LOCAL_STATIC_LIBRARIES += libmusicbundle LOCAL_SHARED_LIBRARIES := \ libcutils \ - -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_LDLIBS += -ldl -else -LOCAL_SHARED_LIBRARIES += libdl -endif + libdl LOCAL_C_INCLUDES += \ @@ -54,12 +49,7 @@ LOCAL_STATIC_LIBRARIES += libreverb LOCAL_SHARED_LIBRARIES := \ libcutils \ - -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_LDLIBS += -ldl -else -LOCAL_SHARED_LIBRARIES += libdl -endif + libdl LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Reverb \ diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk index dff585f..2160177 100644 --- a/media/libeffects/visualizer/Android.mk +++ b/media/libeffects/visualizer/Android.mk @@ -9,19 +9,12 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS+= -O2 LOCAL_SHARED_LIBRARIES := \ - libcutils + libcutils \ + libdl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx LOCAL_MODULE:= libvisualizer -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ system/media/audio_effects/include diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index f7c54fa..7af4a87 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -49,20 +49,12 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ libcamera_client libstagefright_foundation \ - libgui + libgui libdl LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper LOCAL_MODULE:= libmedia -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -lpthread -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index fadad28..ec7d8a0 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -16,10 +16,6 @@ LOCAL_SRC_FILES:= \ StagefrightPlayer.cpp \ StagefrightRecorder.cpp -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) -LOCAL_LDLIBS += -ldl -lpthread -endif - LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ @@ -32,16 +28,13 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright \ libstagefright_omx \ libstagefright_foundation \ - libgui + libgui \ + libdl LOCAL_STATIC_LIBRARIES := \ libstagefright_rtsp \ libstagefright_nuplayer \ -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8c4b274..7b3b95b 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -159,10 +159,8 @@ LOCAL_STATIC_LIBRARIES += \ libchromium_net \ libwebcore \ -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk -endif LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 @@ -175,20 +173,7 @@ LOCAL_SHARED_LIBRARIES += \ libstagefright_enc_common \ libstagefright_avc_common \ libstagefright_foundation \ - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) - LOCAL_LDLIBS += -lpthread -ldl - LOCAL_SHARED_LIBRARIES += libdvm - LOCAL_CPPFLAGS += -DANDROID_SIMULATOR -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) - LOCAL_LDLIBS += -lpthread -endif + libdl LOCAL_CFLAGS += -Wno-multichar diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index 80b2478..6573e3c 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -15,10 +15,8 @@ LOCAL_C_INCLUDES:= \ LOCAL_CFLAGS += -Wno-multichar -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk -endif LOCAL_MODULE:= libstagefright_chromium_http diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index 08ad6f3..d844f3d 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -23,14 +23,7 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libcutils \ libstagefright_foundation \ - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) - LOCAL_LDLIBS += -lpthread -ldl -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif + libdl LOCAL_MODULE:= libstagefright_omx diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk index c25285e..e590bab 100644 --- a/media/mtp/Android.mk +++ b/media/mtp/Android.mk @@ -16,8 +16,6 @@ LOCAL_PATH:= $(call my-dir) -ifneq ($(TARGET_SIMULATOR),true) - include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ @@ -45,8 +43,6 @@ LOCAL_SHARED_LIBRARIES := libutils libcutils libusbhost libbinder include $(BUILD_SHARED_LIBRARY) -endif - ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) -- cgit v1.1