diff options
| author | Erwin Jansen <jansene@google.com> | 2018-02-20 11:39:33 -0800 |
|---|---|---|
| committer | Greg Hartman <ghartman@google.com> | 2018-08-23 17:30:51 -0700 |
| commit | f9688e2b1656a859a729f17862d56e7b9329243d (patch) | |
| tree | e7c755ff9e816ad9f6afdd000e5839186f7eaaad | |
| parent | a18642f334a80ae7e88a1abca8a251bf4d739ea3 (diff) | |
| download | device_generic_opengl-transport-f9688e2b1656a859a729f17862d56e7b9329243d.tar.gz device_generic_opengl-transport-f9688e2b1656a859a729f17862d56e7b9329243d.tar.bz2 device_generic_opengl-transport-f9688e2b1656a859a729f17862d56e7b9329243d.zip | |
Fix missing dlls on windows
- We no longer include libc++.so on windows
- Fix missing dlls due to toolchain changes.
Bug: b/73547546
Test: Launched emulator on windows
Change-Id: I19dd13b40b1655eac71fb8c9a903d0e836d45ecd
| -rw-r--r-- | host/commands/emugen/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/commands/emugen/Android.mk b/host/commands/emugen/Android.mk index 1dbfb046c..777f124ee 100644 --- a/host/commands/emugen/Android.mk +++ b/host/commands/emugen/Android.mk @@ -16,7 +16,7 @@ LOCAL_CFLAGS += -m64 ifeq ($(BUILD_HOST_OS),linux) # Make sure libc++.so can be found - LOCAL_LDFLAGS +=-Wl,-rpath=$(BUILD_OBJS_DIR)/lib64 + LOCAL_LDFLAGS +=-Wl,-rpath=$(BUILD_OBJS_DIR)/intermediates64 endif LOCAL_INSTALL := false @@ -40,6 +40,6 @@ 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 + LOCAL_LDFLAGS +=-Wl,-rpath=$(BUILD_OBJS_DIR)/intermediates64 -m64 endif $(call emugl-end-module) |