[PATCH libdrm 2/2] Revert "libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64"

Emil Velikov emil.l.velikov at gmail.com
Tue Mar 20 17:36:52 UTC 2018


This reverts commit ed07718ae7bab596297abf210bb0c37c6dba58ed.

The commit added a guard since libpciaccess may be missing on some
setups. As of last commit there are no traces of the project, from
Android POV.

Hence, we can revert this workaround - which caused similar breakage to
the one it's trying to fix. This time in Mesa.

Cc: John Stultz <john.stultz at linaro.org>
Cc: Rob Herring <rob.herring at linaro.org>
Cc: John Stultz <john.stultz at linaro.org>
---
 intel/Android.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/intel/Android.mk b/intel/Android.mk
index dd881688..f45312dd 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -21,7 +21,6 @@
 # IN THE SOFTWARE.
 #
 
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -37,4 +36,3 @@ LOCAL_SHARED_LIBRARIES := \
 
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
-endif
-- 
2.16.0



More information about the dri-devel mailing list