diff options
| -rw-r--r-- | host/commands/emugen/Android.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/host/commands/emugen/Android.mk b/host/commands/emugen/Android.mk index 66119faac..1dbfb046c 100644 --- a/host/commands/emugen/Android.mk +++ b/host/commands/emugen/Android.mk @@ -11,6 +11,14 @@ 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)/lib64 +endif + LOCAL_INSTALL := false $(call emugl-end-module) @@ -23,6 +31,15 @@ $(call emugl-begin-host-executable,emugen_unittests) LOCAL_SRC_FILES := \ Parser.cpp \ Parser_unittest.cpp + +LOCAL_LDFLAGS += -m64 +LOCAL_CFLAGS += -m64 + LOCAL_INSTALL := false + $(call emugl-import,libemugl_gtest_host) +ifeq ($(BUILD_HOST_OS),linux) + # Make sure libc++.so can be found + LOCAL_LDFLAGS +=-Wl,-rpath=$(BUILD_OBJS_DIR)/lib64 -m64 +endif $(call emugl-end-module) |