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

[John Stultz]

On Tue, Mar 20, 2018 at 6:55 AM, Stefan Schake <stschake at gmail.com> wrote:
> Hey John,
>
> On Wed, Mar 14, 2018 at 5:47 PM, John Stultz <john.stultz at linaro.org> wrote:
>> 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.
>
> I'm afraid this change has snowballed straight into the mesa build where
> it's now missing dependencies for i915_dri:
>
> external/mesa3d/src/mesa/drivers/dri/i915/Android.mk: error:
> i915_dri (SHARED_LIBRARIES android-arm) missing libdrm_intel
>
> Maybe that one needs the BOARD_GPU_DRIVERS treatment instead..

So tinkering here, it seems to me just changing the conditionalizing
to skipping over just the libpciaccess addition to
LOCAL_SHARED_LIBRARIES might be a simpler solution.

Or would you see that as too ugly?

thanks
-john