Merge "Fix out of bound read in libziparchive" into snap-temp-L07900000056674784

[android-x86/system-core.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index a307719..7c57258 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -15,17 +15,4 @@
 #
 LOCAL_PATH := $(my-dir)
 
-ifneq ($(TARGET_SIMULATOR),true)
-  include $(call first-makefiles-under,$(LOCAL_PATH))
-else
-  include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
-             adb \
-             libcutils \
-             libsysutils \
-             liblog \
-             libnetutils \
-             libpixelflinger \
-             libusbhost \
-             libzipfile \
-          ))
-endif
+include $(call first-makefiles-under,$(LOCAL_PATH))