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: 134529 Delivered-To: patches@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2720618lji; Thu, 26 Apr 2018 12:06:04 -0700 (PDT) X-Received: by 10.99.133.193 with SMTP id u184mr28893384pgd.442.1524769564264; Thu, 26 Apr 2018 12:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524769564; cv=none; d=google.com; s=arc-20160816; b=WQ1QYNWmeHh3c7yMSFjJFdnoM1mZDZ7NeShFxIj6upIcuUsOFHDfnT/GIGLXh1boV6 BUCV3qdFLomCn0xWJRAx4ghmJHanG9nnkr/dcxmJxxjL4/l2HHgY7UDOUj2m+BL5Vzt8 2yG2+EZeXrCM901CshCrl5qqSgtChS6csdnXPMLwUGoofDaDVcBup/fh8DhhQbjGREh+ 6wiEj62XS6MgKLOkcxK4B5kYGlXPKNp6/hFJbwubMeRQxEcDPaCzCTCzF7h06IQfuMm3 G+zjcwIvUGwr9unUJ2z0wdHDkXB80x8JmPweGcvUCCoAEq/RN/s9gzG5zY3d5Ye0KEbQ eFpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=Zcpe5GrBsbedxjnB4wnneAB081gOMbi5Zl7Cbx2GLQU=; b=LhSLFmoF9CQOFS1VIUCikjFPozb6+b33y1UDJIZuweYGP9elNMd36caCjCPbbeVeI2 vaJOFW9H/oFoWbmP/C2mUCYOnvKb60j5d242l6VYoqccAJlS9kNOZZCOlhF0HmaQ34ID 0l6vlHG8V2WA+wicuCZlf7EjIReIhynSWAZUnaM3upx6BdfWcg8qzeLBrhCzlvvQ/TN4 QOl+86OaV4hj5vqVTBRFHevWYsuuS3EU9YpRCw50rrOuc5jkPfY7lF3dAgQaYM4ToRFy /3LNm2ncVQ6esyX34QKSkI+yH8laB8nSbajSvOLKtMbUZtX+d0h5T7acqyaoCNmGfRjf AtWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YZgPrKJy; 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 x11-v6sor6848739plm.108.2018.04.26.12.06.04 for (Google Transport Security); Thu, 26 Apr 2018 12:06:04 -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=YZgPrKJy; 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: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=gbOBjOmSpk8pGuLAJBGSY0s0C0+Tg/o/z5kbbj+TEcFRIfXSmHRtKrHuy1b+0KihTm UqJ2E03J++ieJnlQd2s8cexbCEfBMRWOti8c6I2WbHYqKaz24DJ10E1Z5OZtc0kPuXEf 1Jplfv0o5SmfQr3Y8cJI2qMAIeQTFUxOuqeGd9MUHtI3v1uc3CyvxfzzFT4nYu0Mg8wY 9LFM1BH/JKEiGkSBq+zP9FOKO4c91FLkVvaxFPWFEfSM3uKdzLzUQ4hBM9c45Wqvae2W NSM2BHdKQnQ6dn+Z/DqJ5jcheu8UqDvkY0qTHS7J1p3MlbS/+qUlT5XiHBIftZL+9ywW xvHQ== X-Gm-Message-State: ALQs6tBrtV7yGy034a5lafj1Y7Bwi4npXx9qY58lewfxhv5ScrLg8KFM G8JwB2Bz0mhE5AkMUecSWMhUqFDr 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) Return-Path: 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 Cc: John Stultz , Marissa Wall , Sean Paul , Dmitry Shmidt , Robert Foss , Matt Szczesiak , Liviu Dudau , David Hanna , Rob Herring , Alexandru-Cosmin Gheorghe , Alistair Strachan 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> 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 --- 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(-) -- 2.7.4 Acked-by: Robert Foss 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 {