summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2018-02-28 08:02:35 -0800
committerGreg Hartman <ghartman@google.com>2018-08-23 17:30:51 -0700
commit13564ea4beb88feb96e3a36143ee2a8f4e39fe89 (patch)
treeaf8f17df10b6e847b52e1e024bd79ba14b6263ee
parent57e75d103beaeedcbd854d04456063ded0ed0212 (diff)
downloaddevice_generic_opengl-transport-13564ea4beb88feb96e3a36143ee2a8f4e39fe89.tar.gz
device_generic_opengl-transport-13564ea4beb88feb96e3a36143ee2a8f4e39fe89.tar.bz2
device_generic_opengl-transport-13564ea4beb88feb96e3a36143ee2a8f4e39fe89.zip
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
-rw-r--r--host/commands/emugen/Android.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/host/commands/emugen/Android.mk b/host/commands/emugen/Android.mk
index d3e551d45..e62f3e389 100644
--- a/host/commands/emugen/Android.mk
+++ b/host/commands/emugen/Android.mk
@@ -11,9 +11,6 @@ LOCAL_SRC_FILES := \
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 @@ LOCAL_SRC_FILES := \
Parser.cpp \
Parser_unittest.cpp
-LOCAL_LDFLAGS += -m64
-LOCAL_CFLAGS += -m64
-
LOCAL_INSTALL := false
$(call emugl-import,libemugl_gtest_host)