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

From: John Stultz <john.stultz@linaro.org>
To: dri-devel@lists.freedesktop.org
Cc: Rob Herring <rob.herring@linaro.org>,
	Sean Paul <seanpaul@google.com>,
	Emil Velikov <emil.l.velikov@gmail.com>,
	Tomasz Figa <tfiga@google.com>,
	Marissa Wall <marissaw@google.com>,
	Dan Willemsen <dwillemsen@google.com>,
	Chad Versace <chad.versace@linux.intel.com>
Subject: [PATCH] libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86
Date: Tue,  9 Jan 2018 21:25:39 -0800	[thread overview]
Message-ID: <1515561939-28990-1-git-send-email-john.stultz@linaro.org> (raw)

When building AOSP after updating libdrm project to the
freedesktop/master branch, I've seen the following build errors:

external/libdrm/intel/Android.mk: error: libdrm_intel
(SHARED_LIBRARIES android-arm64) missing libpciaccess
(SHARED_LIBRARIES android-arm64) You can set
ALLOW_MISSING_DEPENDENCIES=true in your environment if this is
intentional, but that may defer real problems until later in the
build.

Using ALLOW_MISSING_DEPENDENCIES=true when building allows
things to function properly, but is not ideal.

So basically, while I'm not including the libdrm_intel package
into the build, just the fact that the Android.mk file references
libpciaccess which isn't a repo included in AOSP causes the build
failure.

So it seems we need some sort of conditional filter in the
Android.mk to skip over it if we're not building for intel.

This is my initial attempt at solving this.

Feedback would be greatly appreciated!

I note that in the AOSP version of libdrm, the reference to
libpciaccess has been removed. See:
 https://android.googlesource.com/platform/external/libdrm/+/f6a1130dffae8de9ddd0c379066daf1df27fc8af%5E%21/
So I wonder if it make sense to instead remove this upstream as
well?

While this patch addresses upstream's Andorid.mk, I also notice
that the AOSP version of libdrm has converted to Android.bp files:
 https://android.googlesource.com/platform/external/libdrm/+/fa32e29a1fe81e5472aabc65d3aa25a5af5aec55%5E%21/
and wonder if getting that conversion upstream would be a good
idea here?

Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Chad Versace <chad.versace@linux.intel.com>
Cc: Marissa Wall <marissaw@google.com>
Cc: Sean Paul <seanpaul@google.com>
Cc: Rob Herring <rob.herring@linaro.org>
Cc: Dan Willemsen <dwillemsen@google.com>
Cc: Tomasz Figa <tfiga@google.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 intel/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
