radeonsi: use a clever alignment for constant buffer uploads

[mesa.git] / src / gallium / drivers / nouveau / Android.mk

diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
index 5275aa601573633f45b22b985ff714231dc1e446..839a3899cb7bacdfdd6fa816c2d22730e543a011 100644 (file)
--- a/src/gallium/drivers/nouveau/Android.mk
+++ b/src/gallium/drivers/nouveau/Android.mk
@@ -28,18 +28,21 @@ include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(C_SOURCES) \
+LOCAL_SRC_FILES := \
+       $(C_SOURCES) \
        $(NV30_C_SOURCES) \
        $(NV50_CODEGEN_SOURCES) \
-       $(NV50_C_SOURES) \
+       $(NV50_C_SOURCES) \
        $(NVC0_CODEGEN_SOURCES) \
        $(NVC0_C_SOURCES)
 
-LOCAL_C_INCLUDES := $(DRM_TOP) \
-       $(DRM_TOP)/include/drm \
-       $(DRM_TOP)/nouveau
-
+LOCAL_SHARED_LIBRARIES := 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)