On Tue, Jan 9, 2018 at 11:25 PM, John Stultz <john.stultz@xxxxxxxxxx> 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 This is only needed for i915 (not i965) now BTW. I'm not sure at what point we stop caring about i915. > (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? Only if we drop i915. > > 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? No, because we still support Android versions back to L. There's also some desire to get meson builds to work in Android build system so we don't have to support multiple build systems. > > Cc: Emil Velikov <emil.l.velikov@xxxxxxxxx> > Cc: Chad Versace <chad.versace@xxxxxxxxxxxxxxx> > Cc: Marissa Wall <marissaw@xxxxxxxxxx> > Cc: Sean Paul <seanpaul@xxxxxxxxxx> > Cc: Rob Herring <rob.herring@xxxxxxxxxx> > Cc: Dan Willemsen <dwillemsen@xxxxxxxxxx> > Cc: Tomasz Figa <tfiga@xxxxxxxxxx> > Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> > --- > 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) This doesn't work for x86_64. i915 and 64-bit may not be a valid combination, not sure, but we do at least build test that. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
