aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-03-18 16:57:33 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-03-18 16:57:33 -0700
commitc1df735e485cc6f37bcd56165a8da8a2569e4feb (patch)
tree514514f1f9e63f63761afeb343e59684a49b4fa6
parent0bc54db4f9a9aab8225f5107a712c4bbbe34f79c (diff)
parent19dacda2b02bb08c0ffb649f84526b249c749279 (diff)
downloade2fsprogs-c1df735e485cc6f37bcd56165a8da8a2569e4feb.tar.gz
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 4e6f042a..ba187a6d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,3 @@
ifneq ($(TARGET_SIMULATOR),true)
-ifeq ($(TARGET_ARCH), x86)
include $(call all-subdir-makefiles)
endif
-endif