radeonsi: don't use lp_build_if for the wrapping if block in merged shaders

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

diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index bfe3987308959cea3010c22e66fd2a7c51f0ff62..9f684cf2445ef5af150f9e6e8ef9dd072cea4b3f 100644 (file)
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,13 +30,32 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon
+LOCAL_C_INCLUDES += $(MESA_TOP)/src/amd/common
+
+LOCAL_SHARED_LIBRARIES := libdrm_radeon
 LOCAL_MODULE := libmesa_pipe_r600
 
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
-LOCAL_C_INCLUDES := external/libcxx/include
-else
-include external/stlport/libstlport.mk
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+intermediates := $(call local-generated-sources-dir)
+
+LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(R600_GENERATED_FILES))
+
+$(intermediates)/egd_tables.h: $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h
+       @mkdir -p $(dir $@)
+       @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+       $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@
+
+ifeq ($(MESA_ENABLE_LLVM),true)
+$(call mesa-build-with-llvm)
 endif
+
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+ifneq ($(HAVE_GALLIUM_R600),)
+GALLIUM_TARGET_DRIVERS += r600
+$(eval GALLIUM_LIBS += \
+       $(LOCAL_MODULE) \
+       libmesa_winsys_radeon)
+$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
+endif