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

Change-Id: I59e3c37c05c1114648172d9aba7abf035986bede
---
 mca/filterfw/native/libfilterfw.mk |  2 --
 wilhelm/src/Android.mk             | 19 ++-----------------
 wilhelm/src/itf/IAndroidEffect.cpp |  4 ----
 wilhelm/tests/Android.mk           |  3 ---
 wilhelm/tests/automated/Android.mk |  3 ---
 5 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/mca/filterfw/native/libfilterfw.mk b/mca/filterfw/native/libfilterfw.mk
index c1fb48a3..4e88e6fa 100644
--- a/mca/filterfw/native/libfilterfw.mk
+++ b/mca/filterfw/native/libfilterfw.mk
@@ -19,9 +19,7 @@ FFW_PATH := $(call my-dir)
 # Uncomment the requirements below, once we need them:
 
 # STLport
-ifneq ($(TARGET_SIMULATOR),true)
 include external/stlport/libstlport.mk
-endif
 
 # Neven FaceDetect SDK
 #LOCAL_C_INCLUDES += external/neven/FaceRecEm/common/src/b_FDSDK \
diff --git a/wilhelm/src/Android.mk b/wilhelm/src/Android.mk
index 8bb7e137..b1fd1f2b 100644
--- a/wilhelm/src/Android.mk
+++ b/wilhelm/src/Android.mk
@@ -152,23 +152,8 @@ LOCAL_SHARED_LIBRARIES :=         \
         libstagefright            \
         libstagefright_foundation \
         libcutils                 \
-        libgui
-
-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
-else
-        LOCAL_CFLAGS += -DTARGET_SIMULATOR
-endif
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-        LOCAL_LDLIBS += -lpthread
-endif
+        libgui                    \
+        libdl
 
 
 
diff --git a/wilhelm/src/itf/IAndroidEffect.cpp b/wilhelm/src/itf/IAndroidEffect.cpp
index 5de24c3c..f34cabdb 100644
--- a/wilhelm/src/itf/IAndroidEffect.cpp
+++ b/wilhelm/src/itf/IAndroidEffect.cpp
@@ -108,15 +108,12 @@ void IAndroidEffect_init(void *self)
 {
     IAndroidEffect *thiz = (IAndroidEffect *) self;
     thiz->mItf = &IAndroidEffect_Itf;
-#ifndef TARGET_SIMULATOR
     thiz->mEffects = new android::KeyedVector<SLuint32, android::AudioEffect* >();
-#endif
 }
 
 void IAndroidEffect_deinit(void *self)
 {
     IAndroidEffect *thiz = (IAndroidEffect *) self;
-#ifndef TARGET_SIMULATOR
     if (NULL != thiz->mEffects) {
         if (!thiz->mEffects->isEmpty()) {
             for (size_t i = 0 ; i < thiz->mEffects->size() ; i++) {
@@ -127,5 +124,4 @@ void IAndroidEffect_deinit(void *self)
         delete thiz->mEffects;
         thiz->mEffects = NULL;
     }
-#endif
 }
diff --git a/wilhelm/tests/Android.mk b/wilhelm/tests/Android.mk
index a82d846b..9580245a 100644
--- a/wilhelm/tests/Android.mk
+++ b/wilhelm/tests/Android.mk
@@ -1,6 +1,4 @@
 # Build the unit tests.
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -37,6 +35,5 @@ $(foreach file,$(test_src_files), \
     $(eval include $(BUILD_EXECUTABLE)) \
 )
 
-endif
 # Build the manual test programs.
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/wilhelm/tests/automated/Android.mk b/wilhelm/tests/automated/Android.mk
index 898e2082..fcb9eeba 100644
--- a/wilhelm/tests/automated/Android.mk
+++ b/wilhelm/tests/automated/Android.mk
@@ -1,6 +1,4 @@
 # Build the unit tests.
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -37,6 +35,5 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
 
 include $(BUILD_EXECUTABLE)
 
-endif
 # Build the manual test programs.
 include $(call all-subdir-makefiles)
-- 
2.11.0