drm: Branch 'master'

 intel/Android.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ed07718ae7bab596297abf210bb0c37c6dba58ed
Author: John Stultz <[email protected]>
Date:   Wed Mar 14 09:47:36 2018 -0700

    libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64
    
    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.
    
    Cc: Chad Versace <[email protected]>
    Cc: Marissa Wall <[email protected]>
    Cc: Sean Paul <[email protected]>
    Cc: Dan Willemsen <[email protected]>
    Cc: Tomasz Figa <[email protected]>
    Cc: Robert Foss <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>
    Signed-off-by: John Stultz <[email protected]>
    Signed-off-by: Rob Herring <[email protected]>

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

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--