From 0bad91971ce601c04fe183b2da0ebd7e6fbb3734 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Mon, 11 Jul 2011 22:12:06 -0700
Subject: Remove the simulator target from all makefiles. Bug: 5010576

Change-Id: Ia539a6a831a7d500d0c5336438e0bc0ff5854bf0
---
 pico/Android.mk            | 5 -----
 pico/compat/jni/Android.mk | 7 +------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/pico/Android.mk b/pico/Android.mk
index 41ad1d3..6203ba9 100755
--- a/pico/Android.mk
+++ b/pico/Android.mk
@@ -1,8 +1,6 @@
 # SVOX Pico TTS Engine
 # This makefile builds both an activity and a shared library.
 
-ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
-
 TOP_LOCAL_PATH:= $(call my-dir)
 
 # Build Pico activity
@@ -132,6 +130,3 @@ LOCAL_SHARED_LIBRARIES := \
         libdl
 
 include $(BUILD_SHARED_LIBRARY)
-
-
-endif # TARGET_SIMULATOR
diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk
index 242047a..900723e 100755
--- a/pico/compat/jni/Android.mk
+++ b/pico/compat/jni/Android.mk
@@ -18,13 +18,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libutils \
 	libcutils
 
-ifeq ($(TARGET_SIMULATOR),true)
- LOCAL_LDLIBS += -ldl
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
 
 LOCAL_ARM_MODE := arm
 
 include $(BUILD_SHARED_LIBRARY)
-
-- 
cgit v1.1