diff options
| author | Erwin Jansen <jansene@google.com> | 2018-02-07 19:38:50 -0800 |
|---|---|---|
| committer | Greg Hartman <ghartman@google.com> | 2018-08-23 17:30:51 -0700 |
| commit | a18642f334a80ae7e88a1abca8a251bf4d739ea3 (patch) | |
| tree | fd2d6607eb2693e11e9c004ceac07b62ef730f86 | |
| parent | b8096f16d2777b70c3c3cbcff8db2b8f502f702d (diff) | |
| download | device_generic_opengl-transport-a18642f334a80ae7e88a1abca8a251bf4d739ea3.tar.gz device_generic_opengl-transport-a18642f334a80ae7e88a1abca8a251bf4d739ea3.tar.bz2 device_generic_opengl-transport-a18642f334a80ae7e88a1abca8a251bf4d739ea3.zip | |
Use libc++ instead of libstdc++ on linux.
- We now use libc++ with clang vs. libstdc++ with gcc4.8
- Fixes compiler issues
- Fixes build scripts to use libc.so, set rpath in executables
- Removes libstdc++.so copying
- Deprecrates -use-system-libs
- Fix reporting bug in rebuild.sh
- Run tests on newer versions of wine.
- Remove 32 bit support on windows, cross compilers currently expect
same bitness on host as as target. Clang only produces 64 bit,
breaking the 32 bit build.
Test: Unit tests green, can launch
Test: Runs on Xenial
Bug: b/37075150
Change-Id: Id37a98c36d7e9c0d26d737286e3a2f9e46269cf6
| -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) |