commit 13564ea4beb88feb96e3a36143ee2a8f4e39fe89
author Erwin Jansen <jansene@google.com> Wed Feb 28 08:02:35 2018 -0800
committer Greg Hartman <ghartman@google.com> Thu Aug 23 17:30:51 2018 -0700
tree af8f17df10b6e847b52e1e024bd79ba14b6263ee
parent 57e75d103beaeedcbd854d04456063ded0ed0212

Enable Windows x86 build

We disabled the Windows 32 bit build during the introduction of clang, we now
turn it back on again

Bug: b/73238968
Change-Id: I3ba976b9b7c40bfdd67cbc7a75161aad3a434b88

host/commands/emugen/Android.mk

diff --git a/host/commands/emugen/Android.mk b/host/commands/emugen/Android.mk
index d3e551d..e62f3e3 100644
--- a/host/commands/emugen/Android.mk
+++ b/host/commands/emugen/Android.mk
@@ -11,9 +11,6 @@
     strUtils.cpp \
     TypeFactory.cpp \
 
-LOCAL_LDFLAGS += -m64
-LOCAL_CFLAGS += -m64
-
 ifeq ($(BUILD_HOST_OS),linux)
   # Make sure libc++.so can be found
   LOCAL_LDFLAGS +=-Wl,-rpath=$(BUILD_OBJS_DIR)/intermediates64
@@ -36,9 +33,6 @@
     Parser.cpp \
     Parser_unittest.cpp
 
-LOCAL_LDFLAGS += -m64
-LOCAL_CFLAGS += -m64
-
 LOCAL_INSTALL := false
 
 $(call emugl-import,libemugl_gtest_host)