Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release

Bug: 5010576

Change-Id: I2abc059ced747dd00f14af35d1c141e36851b3fe

1 files changed, 2 insertions, 8 deletions

diff --git a/Android.mk b/Android.mk
index 331d794..29961ed 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,14 +23,8 @@ LOCAL_MODULE := libemoji
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
-	libutils
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl
-endif
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
+	libutils \
+	libdl
 
 LOCAL_CFLAGS += -Wall -Werror