commit 3f6df6f2bbc670fd3a54b63516c89f682fd234f7
author Elliott Hughes <enh@google.com> Thu Feb 27 18:34:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 27 18:34:44 2014 +0000
tree a64d76b295d145af3a93fc3ba9835c3aa5235e45
parent 2eda01018250d9253bc54da9f6896d58dba1f601
parent 3342800947fd6b3167e14c3858179b830dfa0644

am 33428009: am 780bc50d: am 509b2d73: Merge "TARGET_SIMULATOR is long dead."

* commit '3342800947fd6b3167e14c3858179b830dfa0644':
  TARGET_SIMULATOR is long dead.

bta/Android.mk

diff --git a/bta/Android.mk b/bta/Android.mk
index bca6c08..310080d 100644
--- a/bta/Android.mk
+++ b/bta/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -103,5 +101,3 @@
 
 
 include $(BUILD_STATIC_LIBRARY)
-
-endif  # TARGET_SIMULATOR != true

gki/Android.mk

diff --git a/gki/Android.mk b/gki/Android.mk
index ed9f904..e9ad13a 100644
--- a/gki/Android.mk
+++ b/gki/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -31,5 +29,3 @@
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 include $(BUILD_STATIC_LIBRARY)
-
-endif  # TARGET_SIMULATOR != true

stack/Android.mk

diff --git a/stack/Android.mk b/stack/Android.mk
index 92ce253..f00daff 100755
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -153,5 +151,3 @@
 LOCAL_SHARED_LIBRARIES := libcutils libc
 
 include $(BUILD_STATIC_LIBRARY)
-
-endif  # TARGET_SIMULATOR != true

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 3c3cb61..5053e7d 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -1,3 +1 @@
-ifneq ($(TARGET_SIMULATOR),true)
-  include $(call all-subdir-makefiles)
-endif
+include $(call all-subdir-makefiles)