From patchwork Wed May 2 23:55:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Strachan X-Patchwork-Id: 10377257 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 DD6CE60327 for ; Thu, 3 May 2018 07:17:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C846128EEF for ; Thu, 3 May 2018 07:17:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCB0728F3F; Thu, 3 May 2018 07:17:34 +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=-5.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, MAILING_LIST_MULTI, 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 4F3BA28EEF for ; Thu, 3 May 2018 07:17:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BD9D36E6E1; Thu, 3 May 2018 07:15:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD8466E5FA for ; Wed, 2 May 2018 23:55:31 +0000 (UTC) Received: by mail-pg0-x242.google.com with SMTP id a13-v6so11779469pgu.4 for ; Wed, 02 May 2018 16:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BUXqFDzGYPmHqJF9o+tv9EJfWm200ivEZrxAXZk8Tk8=; b=tPvWw2YR/zghR6aXGTGcTmkcSJlCvlXn82IIn0NZ+x8Ibmhf5dpROlDt65PAmyEbWA vpGnTHPPEVLJ8Duo+4xdb5b2IB6iM9cKL4aPL7c23itlY37ELjPw0Peae2piMmwOje1c Ab99NgLO+ZZrewsqe/Te/BWRnZRIfRUk66WuWIXeL/5MW556DybiMdoXRpDX7Leq5Miz DNkhayWkiTmsYf++2W/ADnGjl+Bg/r6LUcZa5nRz0JrHv8B4gCcY0axolzpnUJ1LJFn+ nrQ5Q/8bApH13t6kjPB7u201tDJHSoYtY1rK/l2pSnU2yicbEkerPsnJKT9Ci/T+jinC d9kQ== 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=BUXqFDzGYPmHqJF9o+tv9EJfWm200ivEZrxAXZk8Tk8=; b=rq2O/SzXROa3Zan9VBdMUnRH1Q9V19hZeclxOXJYcQgVyC/hlGcgLa/JEih8rhBjtY 7pMjMx/dt/tfGB6Gl3cz9j6h/3ASpovXUdRK67tTpI76LEnC53pW0gdmZEUL6mCuKx5u V7Z7fIH0WVTjLtWQl1vBs1Hwlronnw+fITLWGjzjxXrnCcsRE5LXhhpBpE/BuH5kiEb8 6sN6n5YqhydZOCA3RTNYnMaZtDzjjy9kwtPtFDH4j4vlJCXeV/GWoR20D+EdNqvU+GX4 mCIo4OKBuyAarPl1GyokpeFJkp4ROoj3NY03A/y6DpQuZJ07p+thc4vj129Se0SWv7rc Lm+A== X-Gm-Message-State: ALQs6tBLBRKOSbgC/olZoeCATcYnEXeV7njIh+aXyU1EfpzxH+pH6qcI zIUATCyaacVoqJk+54IRNpRlWQijlMY= X-Google-Smtp-Source: AB8JxZpJY1pW/VbB7prGs0uhR9qT1d2HaVO3Dgi+kb5T5Gw/+0s7rXy8dSCUuzZQDgvc6DsYKL2t5w== X-Received: by 2002:a63:8ac4:: with SMTP id y187-v6mr17499642pgd.64.1525305330919; Wed, 02 May 2018 16:55:30 -0700 (PDT) Received: from astrachan.mtv.corp.google.com ([2620:0:1000:1600:4394:e3d:8eee:a828]) by smtp.gmail.com with ESMTPSA id g64sm20815281pfd.50.2018.05.02.16.55.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 16:55:30 -0700 (PDT) From: Alistair Strachan To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm_hwcomposer: Mark tests as vendor, fix build Date: Wed, 2 May 2018 16:55:22 -0700 Message-Id: <20180502235522.104817-1-astrachan@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog X-Mailman-Approved-At: Thu, 03 May 2018 07:15:48 +0000 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: Rob Herring , Sean Paul , Robert Foss , Alistair Strachan MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP After commit 94bb596, the tests for drm_hwcomposer no longer build, because the build system detects that they are linking other vendor modules (but installing themselves elsewhere). This change also adds the libhardware include path explicitly, as the implicit include of hardware/libhardware/include is going away. Cc: John Stultz Cc: Rob Herring Cc: Sumit Semwal Cc: Sean Paul Cc: Robert Foss Signed-off-by: Alistair Strachan --- tests/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Android.mk b/tests/Android.mk index 3b9e0a2..c6a0afa 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -7,6 +7,8 @@ LOCAL_SRC_FILES := \ worker_test.cpp LOCAL_MODULE := hwc-drm-tests +LOCAL_VENDOR_MODULE := true +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_STATIC_LIBRARIES := libdrmhwc_utils LOCAL_SHARED_LIBRARIES := hwcomposer.drm LOCAL_C_INCLUDES := external/drm_hwcomposer