diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
| commit | bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e (patch) | |
| tree | b17fbae7a6ff475ab37be48046d0540d594f84fb /media/libeffects | |
| parent | 3f9dd287b99340efaaa257759e71a8f81b2ed113 (diff) | |
| download | frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.zip frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.gz frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/factory/Android.mk | 8 | ||||
| -rw-r--r-- | media/libeffects/lvm/wrapper/Android.mk | 14 | ||||
| -rw-r--r-- | media/libeffects/visualizer/Android.mk | 11 |
3 files changed, 4 insertions, 29 deletions
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 |