commit bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e
author Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:16 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:16 2011 -0700
tree b17fbae7a6ff475ab37be48046d0540d594f84fb
parent 3f9dd287b99340efaaa257759e71a8f81b2ed113

Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 63fa504..58e7c8d 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -224,22 +224,14 @@
 LOCAL_SHARED_LIBRARIES += libbluedroid libdbus
 endif
 
-ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += \
 	libdl
-  # we need to access the private Bionic header
-  # <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
-  LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
-endif
+# we need to access the private Bionic header
+# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
+LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
 
 LOCAL_LDLIBS += -lpthread -ldl
 
-ifeq ($(TARGET_SIMULATOR),true)
-ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
-LOCAL_LDLIBS += -lrt
-endif
-endif
-
 ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
 	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
 endif