openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-25 12:51:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

android: build with libcxx on android lollipop

Browse Source 
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 <cwhuang@linux.org.tw>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chih-Wei Huang 2015-05-20 11:25:39 +08:00 committed by Eric Anholt
parent 1842832660
commit c5e11e5f7f
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android.common.mk
View File

@ -77,6 +77,7 @@ LOCAL_CFLAGS += \
endif
LOCAL_CPPFLAGS += \
$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
-Wno-error=non-virtual-dtor \
-Wno-non-virtual-dtor

4
src/gallium/drivers/nouveau/Android.mk
View File

@ -39,6 +39,10 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := libdrm libdrm_nouveau
LOCAL_MODULE := libmesa_pipe_nouveau
ifeq ($(MESA_LOLLIPOP_BUILD),true)
LOCAL_C_INCLUDES := external/libcxx/include
else
include external/stlport/libstlport.mk
endif
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)

4
src/gallium/drivers/r600/Android.mk
View File

@ -33,6 +33,10 @@ LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon
LOCAL_MODULE := libmesa_pipe_r600
ifeq ($(MESA_LOLLIPOP_BUILD),true)
LOCAL_C_INCLUDES := external/libcxx/include
else
include external/stlport/libstlport.mk
endif
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)

3
src/gallium/targets/dri/Android.mk
View File

@ -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)

1
src/glsl/Android.mk
View File

@ -46,7 +46,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE := libmesa_glsl
include external/stlport/libstlport.mk
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)