From dd4feb31fc1bce7a4be05407c2b2393450f00537 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@android.com>
Date: Fri, 26 Feb 2010 13:34:01 -0800
Subject: [PATCH] Don't set x86 arch variant.

This was a workaround for a missing bit in the core build.  No longer
needed.
---
 vm/Dvm.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 1504a0229..baf41c6e9 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -290,11 +290,6 @@ endif
 
 ifeq ($(dvm_arch),x86)
   ifeq ($(dvm_os),linux)
-
-# TODO: Remove this once build core defines a default arch variant for x86
-    ifneq ($(dvm_arch_variant),x86-atom)
-        dvm_arch_variant := x86
-    endif
     MTERP_ARCH_KNOWN := true
     LOCAL_SRC_FILES += \
 		arch/$(dvm_arch_variant)/Call386ABI.S \
-- 
2.11.0