From patchwork Wed Jan 10 05:25:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 124012 Delivered-To: patches@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4855033qgn; Tue, 9 Jan 2018 21:25:44 -0800 (PST) X-Received: by 10.84.211.136 with SMTP id c8mr1082929pli.91.1515561944425; Tue, 09 Jan 2018 21:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515561944; cv=none; d=google.com; s=arc-20160816; b=q8WiMhgdrbhrHMxIvuwPRYi2+A6Fc68ZfJFCMvj2v3D8aK/feWvKkrPQSSX6C8lbtO SCjkt+ZcBX9WWcENtshG+G68fSoVD6JiLFDTBRu66aDKyF4hZfPwmr1+ZdsK6XInmEMB H5+RENON7tt4eRwbi12rlv3jrVh59mvDcFhoUrYu7w9SK5KkFBBDI29LWQmODDHi6pj1 iZ8K8yF/iFH596EhkyiBOCrrtggrMsKAp4NZLs5uEtFwTrAT/6eRak4JidgtY0Umh16F k/HgU8X6RGRlCkIpSPArZSzs5b5DO7wRVqFn6m1nO4Naxlg7Fxj7VVHEVZfjLBDjZGTz 4pTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=/fMPiYSDNnLfeFO+DxBuPoA9fPH/u8S5eonnHiq0gbo=; b=lomSXuaAWHWvpZPP/bVbVK7d+DQMSCVBmn3afTMIFz/+GFhiDn+FcalpOeqNa1Tr5i ANPdoQqhXN1kj0HbtjmNAQXUMm4CiobROAJmWB5FUY4Zg4l47XIZdsM63s7hRS3q+cjY cIVh7nsCwDPm1Ru/9ndnvaKOd5naEoBsQ3rE9/deTi6yVBOkfM4yK9UXFu40AccsNmnH 1yz3dB9vVMTY7g2hFd6u3YBXpPKWe3ZLzhgydGNYs5EbN++x9KOLInfv/uyX5viMidaI gV3NHSbO83BHZU67nBunHTxg2JxkayB+Bd2Pi0KRjj0F4spBPZUATisUuZbDOwRRvZqz A40g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QbGxyuHQ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id t7sor371971pgv.353.2018.01.09.21.25.44 for (Google Transport Security); Tue, 09 Jan 2018 21:25:44 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QbGxyuHQ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=/fMPiYSDNnLfeFO+DxBuPoA9fPH/u8S5eonnHiq0gbo=; b=QbGxyuHQZQJF1ocBVD3AvlHNI2a3bvxb6TbWjW9ngrmOzAV90qLurPArV/fJuLU5Ok gwla8Z7XBkO617Q/3XyeXJ032kkKPkcZicrD/vq8lK82Q2FKEFmZnFxfalLk1njOmhiD 2+M+ZiGHsm1ZQNn3ylnK0k2OVa+R1Qv8QlJCA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/fMPiYSDNnLfeFO+DxBuPoA9fPH/u8S5eonnHiq0gbo=; b=I1gWdgj3GbZ/5dXZHlkS1SVKisnkfT6dOgUONMz78VcrzxoGoygBAyrBqTKAc/dNxr 9mbkzJ/64u8M/6qEvLS+DpxtSye8Ld8/xGjeQVJBwnCsYChuIQIwxtg2TiS1uXSWTGUN KdmPC5qmH+ISxsYO3f2z0oXy8ZdqQg5L8kujaBie3i4BUgfSWAPCpfVQjFT+Lg1op4BK jkfl2ezd20dXg6uWwsTN572ox5j9E1XF0hDY3DKbuqHj7GqZIGQCdwVqcS2S6GjFxJ7X Ip4sRO3CLrKy6c5Q4HjmmW86WqsW7/1f5nVBWuejxS6IVwgt6HgrbeInReScyTlG39wB 9O3w== X-Gm-Message-State: AKGB3mKUH+mAYSBolN2zFRTqGCVq1GtlPnPwIaPAiAi0XjAjZ0t+yiBg 41p4JSi8CUaPg9BiMU6yGfMmvzpc X-Google-Smtp-Source: ACJfBotzok8Gsky4ZemSAlakxtWNF9Isd+82K7SbXeWBD0u279hF3QKmrfKXEy8VjJzGA/lewGlmjQ== X-Received: by 10.99.43.86 with SMTP id r83mr14394903pgr.141.1515561943902; Tue, 09 Jan 2018 21:25:43 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id x22sm33586672pfa.169.2018.01.09.21.25.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jan 2018 21:25:42 -0800 (PST) From: John Stultz To: dri-devel@lists.freedesktop.org Cc: John Stultz , Emil Velikov , Chad Versace , Marissa Wall , Sean Paul , Rob Herring , Dan Willemsen , Tomasz Figa Subject: [PATCH] libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86 Date: Tue, 9 Jan 2018 21:25:39 -0800 Message-Id: <1515561939-28990-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 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 Cc: Chad Versace Cc: Marissa Wall Cc: Sean Paul Cc: Rob Herring Cc: Dan Willemsen Cc: Tomasz Figa Signed-off-by: John Stultz --- intel/Android.mk | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 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