diff options
| author | Chih-Wei Huang <[email protected]> | 2015-05-20 11:25:39 +0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-06-09 12:25:50 -0700 |
| commit | c5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8 (patch) | |
| tree | c7112533346a1c976e9a81fcb24e307cfb75f6df /src/gallium/targets | |
| parent | 1842832660c4eade037caa760110b58a2d7f055b (diff) | |
android: build with libcxx on android lollipop
On Lollipop, apparently stlport is gone and libcxx must be used instead.
We still support stlport when building on earlier android releases.
Signed-off-by: Chih-Wei Huang <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 78f7b7c61f9..1772d250b4b 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -95,7 +95,7 @@ gallium_DRIVERS += libmesa_winsys_svga libmesa_pipe_svga LOCAL_CFLAGS += -DGALLIUM_VMWGFX endif ifneq ($(filter nouveau r600g,$(MESA_GPU_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libstlport +LOCAL_SHARED_LIBRARIES += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),libc++,libstlport) endif LOCAL_STATIC_LIBRARIES := \ @@ -116,6 +116,7 @@ LOCAL_STATIC_LIBRARIES += \ libLLVMR600Info \ libLLVMR600AsmPrinter \ libelf +LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) endif include $(GALLIUM_COMMON_MK) |