diff options
| author | Emil Velikov <[email protected]> | 2017-03-17 16:55:24 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-30 19:07:23 +0100 |
| commit | 4ffb3949616e0aaf2f46a4c1a59421bb5a21ad9b (patch) | |
| tree | 956d8f11cc240a05d749474e7b8c558380936bab | |
| parent | 331714d72eb33bfcc401e99629dd3e416652a15a (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/intel/Android.blorp.mk | 2 | ||||
| -rw-r--r-- | src/intel/Android.compiler.mk | 3 | ||||
| -rw-r--r-- | src/intel/Android.vulkan.mk | 13 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/intel/Android.blorp.mk b/src/intel/Android.blorp.mk index 5297af2b7c3..e1aa908706e 100644 --- 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 81209f4ed0a..37d75b5679e 100644 --- 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 cc0b5dff044..831b6584dc8 100644 --- 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) |