From patchwork Tue Mar 20 17:36:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 10297603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5618E60386 for ; Tue, 20 Mar 2018 17:42:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46E1928BDF for ; Tue, 20 Mar 2018 17:42:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B54228E91; Tue, 20 Mar 2018 17:42:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0425B28BDF for ; Tue, 20 Mar 2018 17:42:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 925BD6E82A; Tue, 20 Mar 2018 17:42:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E3246E814 for ; Tue, 20 Mar 2018 17:42:01 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id z8so2583147wrh.7 for ; Tue, 20 Mar 2018 10:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p8GJjvaIynsqSVwX0WMeNKGcC7J/bCbXbJ/ie+5I9SY=; b=azwUXQtt3+qZQMEu001LtRQfZgR7TtZzHaFBLtziZjTCbe7RfcHBDduQtMFW7Pmvqp RZ/JSwr85/err0pi92Nt+dSieJja9AmxecLCl/fHcTnXRdhaIiLxMSLN0vY9c1zVImTk 4Gq3FbX4/1w66gpXTPYcdZL/A+yBot6USrXS7wU2FwaaxR0dksTYQSll5FmU6EZzZn6W v9xHm74Dk7dLb6jY3PeYI2/NZhYGlBDTS97KVcgw/ROu4M8mM3Eo+DJpXN53A4JblcOD gx6krK/voME+/uR/MkSmRarFLjenwQ9cUixOOc3uHoVUOkbR8BAwThOJxdo/kfecucfk +PPw== 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:in-reply-to :references; bh=p8GJjvaIynsqSVwX0WMeNKGcC7J/bCbXbJ/ie+5I9SY=; b=DHSIgzo7tRtikOZaIwgwarKr9ouHbWJFzmF1jV+406fkynNZ6/84IoE/L1iDLmKcq5 DPQ3S65kMFX3NjzQ63rDDNTOAgWFmfrscZwtIzatNAijt65+qP1woGHs3EHJjao6AFJV VxFJIWWgvCDSG1IjJxHSZKO+HPSKcDBjfXJNQ4uIv8uGP1IPLRnXXFbSZB6xvTOVsEk6 4OYkgZ5wfpBET7PrYqTk9mzMedLrtQXQORo/nNiynxdwnc/4HN8Uq4WK/T1qvImoqJ6V Zwrf+Qn4r3NQVymZC+lbAcfLxmJZqkKE5XhqoJXkq5ZxrujWZXLUekCyqjUNZ0bTXS4G qheQ== X-Gm-Message-State: AElRT7FL96XIlW4JV8C+tTWrQ15NAI1nhrwHEeoUnz1ByKFsYqC+wJqd 3ZlOvCK31kGIKFDtPNuTVWK6hg== X-Google-Smtp-Source: AG47ELuMz0eDlkdQQw2h+kicDGJfFDtZGxW2NIeki1qjOYSTJEJR7bfzCycYqqPX041mJiclnSJQ4A== X-Received: by 10.223.178.87 with SMTP id y23mr13326367wra.95.1521567719818; Tue, 20 Mar 2018 10:41:59 -0700 (PDT) Received: from arch-x1c3.cbg.collabora.co.uk ([2a00:5f00:102:0:9665:9cff:feee:aa4d]) by smtp.gmail.com with ESMTPSA id y68sm2419059wrb.73.2018.03.20.10.41.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 10:41:58 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 2/2] Revert "libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64" Date: Tue, 20 Mar 2018 17:36:52 +0000 Message-Id: <20180320173652.5917-2-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180320173652.5917-1-emil.l.velikov@gmail.com> References: <20180320173652.5917-1-emil.l.velikov@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emil.l.velikov@gmail.com, Rob Herring MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit ed07718ae7bab596297abf210bb0c37c6dba58ed. The commit added a guard since libpciaccess may be missing on some setups. As of last commit there are no traces of the project, from Android POV. Hence, we can revert this workaround - which caused similar breakage to the one it's trying to fix. This time in Mesa. Cc: John Stultz Cc: Rob Herring Cc: John Stultz Acked-by: John Stultz --- intel/Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/intel/Android.mk b/intel/Android.mk index dd881688..f45312dd 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -21,7 +21,6 @@ # IN THE SOFTWARE. # -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -37,4 +36,3 @@ LOCAL_SHARED_LIBRARIES := \ include $(LIBDRM_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -endif