Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ida75833739d363061c2e688a6c7f7d7b3f3edd1e
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk
index 92db50b..be17b83 100755
--- a/libvideoeditor/lvpp/Android.mk
+++ b/libvideoeditor/lvpp/Android.mk
@@ -81,10 +81,7 @@
$(TOP)/frameworks/base/services/audioflinger
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \
diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk
index 9252951..c70aecc 100755
--- a/libvideoeditor/osal/src/Android.mk
+++ b/libvideoeditor/osal/src/Android.mk
@@ -46,10 +46,7 @@
LOCAL_C_INCLUDES += \
$(TOP)/frameworks/media/libvideoeditor/osal/inc \
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \
diff --git a/libvideoeditor/vss/3gpwriter/src/Android.mk b/libvideoeditor/vss/3gpwriter/src/Android.mk
index 61d7d6a..4cd5e55 100755
--- a/libvideoeditor/vss/3gpwriter/src/Android.mk
+++ b/libvideoeditor/vss/3gpwriter/src/Android.mk
@@ -41,10 +41,7 @@
$(TOP)/frameworks/media/libvideoeditor/vss/3gpwriter/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/common/inc
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \
diff --git a/libvideoeditor/vss/mcs/src/Android.mk b/libvideoeditor/vss/mcs/src/Android.mk
index 0bfc0b6..2e30edb 100755
--- a/libvideoeditor/vss/mcs/src/Android.mk
+++ b/libvideoeditor/vss/mcs/src/Android.mk
@@ -44,10 +44,7 @@
$(TOP)/frameworks/media/libvideoeditor/vss/common/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/stagefrightshells/inc
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \
diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk
index ba59088..55d78d3 100755
--- a/libvideoeditor/vss/src/Android.mk
+++ b/libvideoeditor/vss/src/Android.mk
@@ -70,10 +70,7 @@
$(TOP)/frameworks/base/services/audioflinger \
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \
diff --git a/libvideoeditor/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk
index 06fd4c4..589e172 100755
--- a/libvideoeditor/vss/video_filters/src/Android.mk
+++ b/libvideoeditor/vss/video_filters/src/Android.mk
@@ -45,10 +45,7 @@
$(TOP)/frameworks/media/libvideoeditor/osal/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/common/inc
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES += libdl
# All of the shared libraries we link against.
LOCAL_LDLIBS := \