commit be42930f0b8d66dfb05127fd3d524e596de65595
author Bruce Beare <brucex.j.beare@intel.com> Mon May 03 16:14:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 03 16:14:51 2010 -0700
tree f9bd52b201736ba318ded2945ceb9123aed3c022
parent 52219a68a83c47f8c5b93038f57f3f130e7d0823
parent 97ca48e7f4ac8d3842f74f92b8f40d0e74733f38

am 97ca48e7: generic_x86 support

Merge commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38' into kraken

* commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38':
  generic_x86 support

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index bb024f6..e91e4bf 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -14,6 +14,7 @@
 
 ifneq ($(TARGET_SIMULATOR),true)
 
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -58,4 +59,5 @@
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif   # TARGET_ARCH == arm
 endif  # !TARGET_SIMULATOR