Merge "Remove the simulator target from all makefiles. Bug: 5010576"
diff --git a/Android.mk b/Android.mk
index 48df613..bba6122 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,3 @@
-BUILD_VOLD2 := false
-ifneq ($(TARGET_SIMULATOR),true)
-    BUILD_VOLD2 := true
-endif
-
-ifeq ($(BUILD_VOLD2),true)
-
 LOCAL_PATH:= $(call my-dir)
 
 common_src_files := \
@@ -79,5 +72,3 @@
 LOCAL_SHARED_LIBRARIES := libcutils
 
 include $(BUILD_EXECUTABLE)
-
-endif # ifeq ($(BUILD_VOLD,true)