From patchwork Wed Mar 14 16:47:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 131668 Delivered-To: patches@linaro.org Received: by 10.80.210.197 with SMTP id q5csp398010edg; Wed, 14 Mar 2018 09:47:41 -0700 (PDT) X-Received: by 10.98.33.76 with SMTP id h73mr4888458pfh.144.1521046061233; Wed, 14 Mar 2018 09:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521046061; cv=none; d=google.com; s=arc-20160816; b=XoDe3xXz+SrUQ5VYKUYRQGJyGvu2YYVQwX2O277rA+gmzA1MgdkkUDwI227INfr2nm BevZtWLCI/hU27RbZXN/c1cxmJdwma+UpIBxwLmlPdkClSXRwGJdax8XLHvlRjVEzYHL TxPRK9SUVApZ8lXs5gELCD4kyWqZCJ7potONFl665f6nCTYnLoTr5z6AC+RrN5i/6N6r 5RG9Mt4Jz/L6ZfBx05g31LyclZL730u0H6WDwNECQ/dG9gor9cm1VFnbfI01KGLWSg43 MA5DSWvCV9WidFUjEDVZCrLORYhdULBqGZnIOwG9GXUUxHc6u8zWm2aqpyp9LdPzdJjj 2hLQ== 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=9FjKlq0dExh80RQx/jWNqervPd1sVkaR9IqWA6/r25s=; b=GTWraZcCyiO35/udI2eYg0jHLxlAAVLrHshnJuJjnJNYMmtOX0ZKus5VpPjgILg8X7 PZIe87OvE/IYmBl/QgPiLhHZaz5gh89kgVfgb6tpEMWRI/tug9hL3vG2pgNCzsjDk6gX HeVTvsloMBoOKXbQaBd5VTOT2XVu9KEsie0F2R8sp0LHxAgg7613/pKf6g/0J+BSQEoO 6LxVNw3sIkE3jdgMpJLj53xwCKlGqftUNjDPyPlkWzYZwupPa1cA8EonJ641r4KxLtdH QpbFhvdvKZH3k7Iz/mdV9BTO/wFAvy2h94DWhnAvldsumDu7BV8/+bNI3gcs8ekIuwoW CdIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ajdL+c7u; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p1-v6sor980608pld.119.2018.03.14.09.47.41 for (Google Transport Security); Wed, 14 Mar 2018 09:47:41 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ajdL+c7u; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 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=9FjKlq0dExh80RQx/jWNqervPd1sVkaR9IqWA6/r25s=; b=ajdL+c7uXXVfAFWhLA7l4ZLKDtH4Il77pPl3GICTDGQrO+fXAY6RHt3HrOnL4RH4eY w/ydn2cZ1WrG1Y5Rlyw48fk6S3Sr+koPUeEiQO5ITf98d/e8mC12DebDnEbpq7GxEC1k dWMqdW8Ccfqk0QcTRZOj6+2ZkbGC0yF1AnKtU= 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=9FjKlq0dExh80RQx/jWNqervPd1sVkaR9IqWA6/r25s=; b=dyYdGEvJiJbnL6Y3RN5src9eVS45GIUluQLyfbDnObMQCUB5h2aDsKYX3u3pPBYUjH UXsiQFqvIb8bZW9DbiGqnMSWmTvIXg6tywqSNi+liqNksRrDptziPfEnnTQ5ulqTS8qt h2Bjvm91zp0+hex9TpbYyMKJLZzLiRv66TjKhy4cJv3JaR6m5ORHJUsgz6pDvA1lvEiV BJHhSwfHR4XEx6arG9RcwxY7WjYhonqJyruAhsi/ai8W/1flAk7dWpfqA952ohq5sg+6 an1AAEtsT8eNvtpuOPJGqaxgwZR9F8gSpxwqNQgnuKLHOrmDKgd70526FgoMYbsg12sY AEAg== X-Gm-Message-State: AElRT7Fut5qV9SxrZHYQtkY34FSSYGQiUSzp9xgcMiBCcf3EpTVIJ8aH Tx6X/FOPgFqB9/r+4krvMwKvzZhK X-Google-Smtp-Source: AG47ELtpJmMfYzsSoo9Z8WsyWIfPeLsZWxVURBuqIEZjTpnTfhyfAdu/e23bQcCOetfHppLlI8bS+w== X-Received: by 2002:a17:902:8485:: with SMTP id c5-v6mr2697384plo.230.1521046060634; Wed, 14 Mar 2018 09:47:40 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id k3sm5650016pgn.27.2018.03.14.09.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Mar 2018 09:47:39 -0700 (PDT) From: John Stultz To: dri-devel Cc: John Stultz , Emil Velikov , Chad Versace , Marissa Wall , Sean Paul , Rob Herring , Dan Willemsen , Tomasz Figa , Robert Foss Subject: [PATCH] libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64 Date: Wed, 14 Mar 2018 09:47:36 -0700 Message-Id: <1521046056-10946-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. Change-Id: I6cb51c7bb0a7d1a0ab1723b7d3f20aea38988495 Cc: Emil Velikov Cc: Chad Versace Cc: Marissa Wall Cc: Sean Paul Cc: Rob Herring Cc: Dan Willemsen Cc: Tomasz Figa Cc: Robert Foss Signed-off-by: John Stultz --- v2: Check for x86_64 as well --- intel/Android.mk | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 Reviewed-by: Emil Velikov diff --git a/intel/Android.mk b/intel/Android.mk index 5407ff3..3f9db78 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