intel: android: remove libdrm_intel requirement

The only part which requires libdrm_intel tools/aubinator is not built
on Android.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/intel/Android.blorp.mk b/src/intel/Android.blorp.mk
index 5297af2b7c3eab5ccc6da86000190559ca1b91e9..e1aa908706e033fa27bd8bec16ef8091dd8643b1 100644 (file)
--- a/src/intel/Android.blorp.mk
+++ b/src/intel/Android.blorp.mk
@@ -41,7 +41,5 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := libmesa_nir
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
-
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/intel/Android.compiler.mk b/src/intel/Android.compiler.mk
index 81209f4ed0aeef73a9f051ffefbd38b435aaf8c6..37d75b5679e7a82f29c04a491adb5d0211280aa7 100644 (file)
--- a/src/intel/Android.compiler.mk
+++ b/src/intel/Android.compiler.mk
@@ -46,9 +46,6 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/intel/compiler \
        $(MESA_TOP)/src/compiler/nir
 
-LOCAL_SHARED_LIBRARIES := \
-       libdrm_intel
-
 brw_nir_trig_workarounds_deps := \
        $(LOCAL_PATH)/compiler/brw_nir_trig_workarounds.py \
        $(MESA_TOP)/src/compiler/nir/nir_algebraic.py

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index cc0b5dff0441ec56a62aa14e06abf1d64384ace4..831b6584dc89727f7912b6e961a39c67f80d6944 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -66,7 +66,7 @@ $(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         $(intermediates)
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -112,7 +112,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -132,7 +132,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -152,7 +152,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -191,7 +191,7 @@ $(intermediates)/vulkan/anv_entrypoints.c:
                --xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
                --outdir $(dir $@)
 
-LOCAL_SHARED_LIBRARIES := libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -231,8 +231,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_intel_compiler \
        libmesa_anv_entrypoints
 
-LOCAL_SHARED_LIBRARIES := \
-       libdrm_intel
+LOCAL_SHARED_LIBRARIES := libdrm
 
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)