From patchwork Thu Apr 26 19:05:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10366699 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 74903601BE for ; Thu, 26 Apr 2018 19:06:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64EC1291D6 for ; Thu, 26 Apr 2018 19:06:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59187291EE; Thu, 26 Apr 2018 19:06:11 +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_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 D349D291D6 for ; Thu, 26 Apr 2018 19:06:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D86966E0AA; Thu, 26 Apr 2018 19:06:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9508D6E0AA for ; Thu, 26 Apr 2018 19:06:04 +0000 (UTC) Received: by mail-pf0-x242.google.com with SMTP id l27so19102624pfk.12 for ; Thu, 26 Apr 2018 12:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zcpe5GrBsbedxjnB4wnneAB081gOMbi5Zl7Cbx2GLQU=; b=YZgPrKJyCr58GFnAIVZlQq+wrP5UjMMKBwuLUeIPxGeFtENymCkUVqcCzJ0HClwV7h kA+MuOox+b9l0DR2JpINAn2YSZgrg/hHPPjEgf56Kz8PFaNlJSx5G71nyLKZF6jAzEEh /RL5Kn5pLFPvwEULvrw0QwDKlF8H+j4r5/OtA= 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=Zcpe5GrBsbedxjnB4wnneAB081gOMbi5Zl7Cbx2GLQU=; b=FfN5XPVhPysOwG6U0C/GVHQkOaTQih/hQStO/aE6kXlFQItpTa14MRAPQYLlqBLnGY vr6kigcRNc2J0gUH/FLjiwukZOIuXcC3cLmzBnF0g4eU/xwhmW/QICfKOrBYBu4nCwYW syEV9nSulth+oaQCnKM3TrD3LOeGctKWTXYgvaRE4Uf7I9GPcJvlm8K4tEKpILoqa3x0 Yt/Gfec2g7xMqCl4HEKC8WBRfQdb5xS5ioL1I0sjFcIroMQJ4E85RPsVLoN8t1MUGvWa Wu6HhIM/idmYZIBvsSnI5u4Hhn2bjsyXH5Vg0kiOivO4Uc8jG/oy7BFSqaRu1Pk0wzb4 9bpg== X-Gm-Message-State: ALQs6tBGvVPCPOeYcgao6Ve9bDTwouVxENS+cPGD8wvRmP6ntngAhknL JMEFzRr7LZmgRvZPaB0vrrWHSC3AXbI= X-Google-Smtp-Source: AIpwx499wAa65fdA+eVqKrXLJpR1w754RtR4wVdDk4BAL5ytFnkRyj71w8XezAtBbU9XUKkGdW0CXw== X-Received: by 2002:a17:902:5304:: with SMTP id b4-v6mr23172321pli.231.1524769563746; Thu, 26 Apr 2018 12:06:03 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id a15sm33710956pfn.31.2018.04.26.12.06.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 12:06:02 -0700 (PDT) From: John Stultz To: dri-devel Subject: [PATCH hwc 2/4] drm_hwcomposer: Use log/log.h instead of cutils/log.h Date: Thu, 26 Apr 2018 12:05:55 -0700 Message-Id: <1524769557-6108-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524769557-6108-1-git-send-email-john.stultz@linaro.org> References: <1524769557-6108-1-git-send-email-john.stultz@linaro.org> 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 , Matt Szczesiak , Dmitry Shmidt , Sean Paul , Robert Foss , Alexandru-Cosmin Gheorghe , Liviu Dudau , Alistair Strachan , Marissa Wall , David Hanna MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When enabling Treble, Android builds are complaining about using cutils/log.h so instead use log/log.h Cc: Marissa Wall Cc: Sean Paul Cc: Dmitry Shmidt Cc: Robert Foss Cc: Matt Szczesiak Cc: Liviu Dudau Cc: David Hanna Cc: Rob Herring Cc: Alexandru-Cosmin Gheorghe Cc: Alistair Strachan Signed-off-by: John Stultz Acked-by: Robert Foss --- autolock.cpp | 2 +- drmcompositorworker.cpp | 2 +- drmconnector.cpp | 2 +- drmcrtc.cpp | 2 +- drmdisplaycomposition.cpp | 2 +- drmdisplaycompositor.cpp | 2 +- drmeventlistener.cpp | 2 +- drmhwctwo.cpp | 2 +- drmplane.cpp | 2 +- drmresources.cpp | 2 +- hwcomposer.cpp | 2 +- hwcutils.cpp | 2 +- platform.cpp | 2 +- platformdrmgeneric.cpp | 2 +- platformhisi.cpp | 2 +- virtualcompositorworker.cpp | 2 +- vsyncworker.cpp | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/autolock.cpp b/autolock.cpp index 1a2ded7..795a8c2 100644 --- a/autolock.cpp +++ b/autolock.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace android { diff --git a/drmcompositorworker.cpp b/drmcompositorworker.cpp index a4e7fc9..695876d 100644 --- a/drmcompositorworker.cpp +++ b/drmcompositorworker.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include namespace android { diff --git a/drmconnector.cpp b/drmconnector.cpp index 145518f..10b96b5 100644 --- a/drmconnector.cpp +++ b/drmconnector.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace android { diff --git a/drmcrtc.cpp b/drmcrtc.cpp index 1b354fe..4033269 100644 --- a/drmcrtc.cpp +++ b/drmcrtc.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace android { diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp index 66e67a4..24a8e9c 100644 --- a/drmdisplaycomposition.cpp +++ b/drmdisplaycomposition.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp index e556e86..e570923 100644 --- a/drmdisplaycompositor.cpp +++ b/drmdisplaycompositor.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/drmeventlistener.cpp b/drmeventlistener.cpp index 5534182..9cdff81 100644 --- a/drmeventlistener.cpp +++ b/drmeventlistener.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp index dfca1a6..8e00d71 100644 --- a/drmhwctwo.cpp +++ b/drmhwctwo.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/drmplane.cpp b/drmplane.cpp index 1f739ae..4449256 100644 --- a/drmplane.cpp +++ b/drmplane.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include namespace android { diff --git a/drmresources.cpp b/drmresources.cpp index 32dd376..ec6664c 100644 --- a/drmresources.cpp +++ b/drmresources.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include namespace android { diff --git a/hwcomposer.cpp b/hwcomposer.cpp index c0aafef..338e042 100644 --- a/hwcomposer.cpp +++ b/hwcomposer.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/hwcutils.cpp b/hwcutils.cpp index 53a7d82..715c93e 100644 --- a/hwcutils.cpp +++ b/hwcutils.cpp @@ -20,7 +20,7 @@ #include "drmhwcomposer.h" #include "platform.h" -#include +#include namespace android { diff --git a/platform.cpp b/platform.cpp index 56ab37e..62b03a8 100644 --- a/platform.cpp +++ b/platform.cpp @@ -19,7 +19,7 @@ #include "drmresources.h" #include "platform.h" -#include +#include namespace android { diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp index 2a6773c..8253967 100644 --- a/platformdrmgeneric.cpp +++ b/platformdrmgeneric.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/platformhisi.cpp b/platformhisi.cpp index 16c5e6f..3f5c319 100644 --- a/platformhisi.cpp +++ b/platformhisi.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "gralloc_priv.h" diff --git a/virtualcompositorworker.cpp b/virtualcompositorworker.cpp index 639dc86..b64b414 100644 --- a/virtualcompositorworker.cpp +++ b/virtualcompositorworker.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/vsyncworker.cpp b/vsyncworker.cpp index 3bfe4be..d431d2e 100644 --- a/vsyncworker.cpp +++ b/vsyncworker.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include namespace android {