From patchwork Wed Aug 1 23:20: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: 143320 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458932ljj; Wed, 1 Aug 2018 16:20:45 -0700 (PDT) X-Received: by 2002:a62:2e02:: with SMTP id u2-v6mr381701pfu.134.1533165645448; Wed, 01 Aug 2018 16:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165645; cv=none; d=google.com; s=arc-20160816; b=g0FwPOZUuXVHJdlt6/BVT6pjJk/cFiw/udmHVhtByla6THCZTXhP+v+hfEkFFEQ5OY UXeff5qz16x8EO9tD1CLJtkAjpCzwPePXxU0Mx5eJXak6OByw06UtQUmaiOWogKLkpOA ELjB5Ja7zBSNYOW47loKMB0/ZmE67xDuvrP1bQSCLaHPHayI1E6cPB1gU/39RBZVxSUS S5G1YATwcJVfCXRll6yWkzZWpO/Jzp2iXW/QMGzejdjDIxRPjoEBnbkEMn5mQobHqcYf YqDceR6BS5trdEnAsZFdRm/nsun/kcnjMiURURyQwXI3LSyzR0GbdiMyGuuEGto1oD9R qxtA== 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=WPmADh9aKcGfeBTYHqm/POwYOTPBqtqioOmLWDYMwlPGW/wItqZBuJR6eQqe880FJR sTnda1LgT6rjsS0TuK4xRogfHFr5Cy3z3ns6oLKSZJbGtTYS8/OlvX5oViHa0Z2691Fh onWC8HGBRyLIrOG50+a2QqgCf/tI6rLUqTij93uWAD0kaDEGSaa/I9pdno7X2rv3XB+C 90z4E8JQL06+O5HC1TWICSCoEWnJgTJk+1zIn+wo0asCTpa153NEmXOp62B7F+Bfr4DG WItAYckohbOO+oZ8s/Ahk+JvQ6PsDQpgEvz1X4Qarr7kPzN6Icdihb4gKnj4GlpYdsLH mTNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=coI8tuLF; 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 k26-v6sor82416pgn.77.2018.08.01.16.20.45 for (Google Transport Security); Wed, 01 Aug 2018 16:20:45 -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=coI8tuLF; 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=coI8tuLF2cgK+uzPOrohBNRpbSZvt7YjbepGQgsezZikoA6U4+dlO/wgOWI1ecs9LP 1KZzy+uOnXOuzx6CCbBw1bPS1q3Jbw0R66QSCEz45efEU6+Ux4sJTu31rYUUJXOhbzkD jNfnvHzX+9PYYyubUhLRvE8va3v43Ij/2jlFw= 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=Nlm/3ZZ797XAJMF2kKYrUj7PmrBaj4dyfKDHVZ6iQZVZPexwWmtdZM04oU/+aG3QE9 VahzsArMGrE3Q3+fwmPvtFzPmUE8uvLBS+9OWIeZEqJZARcmSOvlt2ACfsHLkpEOwWBz pWaSxhdF44kYaFYAlMwQ6suzlVjsKZFZwHKAepQsblAyMNvjgeTw82SX4O7/YJt9kEs9 7nDrIQxP9qsY+kfJ/wsPF7l8Ew90+hP10z+bEUliEvTAK/Kz8djAji0XB5oRjD0TcFUc Jji6udTIrEngHv40Bbp2IihuTCxExmL0GAz8MB1jT4n7pNk1SFltujlTV0zhRIlUOv8o HHYA== X-Gm-Message-State: AOUpUlHDHbwhHfXmuvY0C8I9UU0qgNrkzsAWOgAHTA8fvLO1etnyr9Mj yPPrJPnKHZmaPt1h3GLX/6NV02wJ X-Google-Smtp-Source: AAOMgpd6/BhiVTJsl1H30UCAVCLGA9tN0JnVdD0WiR916il4DOPnn9DFKl1Cqpj23iOYQSRvM5LGXg== X-Received: by 2002:a63:e14a:: with SMTP id h10-v6mr351105pgk.358.1533165644845; Wed, 01 Aug 2018 16:20:44 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:43 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Dan Willemsen , Rob Herring , Alistair Strachan , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 1/3 v3] util: Android.mk: Convert implicit rules to static pattern rules Date: Wed, 1 Aug 2018 16:20:36 -0700 Message-Id: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 From: Dan Willemsen This is a partial cherry-pick from AOSP's mesa3d tree: https://android.googlesource.com/platform/external/mesa3d/+/a88dcf769eb00a4ffc7183a0396d881a28b5a29b%5E%21/ "We're deprecating make implicit rules, preferring static pattern rules, or just regular rules." Without this patch, the freedesktop/master branch won't build in the AOSP environment, and this patch corrects that, as tested on the Dragonboard 820c. The i965 portion of the patch this is based on collided badly, and I'm not sure how to best forward port it. However, so far we don't see build issues without that portion. Comments or feedback would be appreciated! Change-Id: Id6dfd0d018cbd665fa19d80c14abd5f75fa10b8a Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov Signed-off-by: John Stultz --- src/util/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/src/util/Android.mk b/src/util/Android.mk index 9b61442..e463b63 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -71,7 +71,7 @@ $(POT): $(LOCAL_PATH)/xmlpool/t_options.h @mkdir -p $(dir $@) xgettext -L C --from-code utf-8 -o $@ $< -$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) +$(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.po): $(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) lang=$(basename $(notdir $@)); \ mkdir -p $(dir $@); \ if [ -f $< ]; then \ From patchwork Wed Aug 1 23:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 143321 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458952ljj; Wed, 1 Aug 2018 16:20:46 -0700 (PDT) X-Received: by 2002:a63:1d3:: with SMTP id 202-v6mr350443pgb.136.1533165646814; Wed, 01 Aug 2018 16:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165646; cv=none; d=google.com; s=arc-20160816; b=ZsUw947WSPToYyEKAH3um0LNZTZ11w5EqNevo4QPWxDIY9SNa/2ZFxF6fl3ET7p8w/ sEm0tmsyWDPmYEh1ElHsregEADK4Yo8oVSIRNJUyvCR+v7DLigBKdP+iJv5XbDJ9iZC6 N01CMVJObwAWkF7fRBaxF/QUzyAtBAevDcYFRdwXnjqPx7mJ0SDmSgNINg/bSY9Cl8Yq jeXHFhlfrsvsiovTVccMP1LqfejfOAO3MAPlRCzrFCwQYkI4wvfe+6D6qvVOB3fRq9sX q3WfISs6nkxyQ31gLuLuByIzFT8xhLPb9HtUimlD84+ml7FaC/ATmt3DQV1JjEf99oqV wlRA== 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=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=0pFUqd9yPhBwMr3RD8eU8F4RbPWCqsgHpMqR2tnO56vc+nMFRhGb307WiL7e0q0ukD AiiiZFx8tbvyEupl7UcgHNWHYL6tcvh+H1a/BLcxwwWRlDBAyzl2g/jQOz6YolFtJ5x4 0N5fQIgyYMR/JxokE74f4PV3YYmAGYk4GRxlrm7cFfx/LO0JB+j7JN1RQNfoDaQhzB9o 8aZ2CkSGdaioI/jeIIILA72jmonNfVGUJ6ei7DqpCQ67GG2F7ameYSNA+3rRiIrjDNq8 ItZMeWy43MAZ3HEkkq3S95byKWj4oopwpcWgPyGex1tD2fmr7l2iuf7FIyso5uVkDMcI HQyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=adeBKVn4; 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 k5-v6sor79339pgp.179.2018.08.01.16.20.46 for (Google Transport Security); Wed, 01 Aug 2018 16:20:46 -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=adeBKVn4; 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=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=adeBKVn4Nvqg72gfHh+8kMhSJmZXeiVM4Wg/29d5KkK3cZr6ObBVuevR77+3I3co4V Vf+rZTB1H2QdwphndhXbR3bfnH6bqScy5sUeqIPUNJl1yOFCdzKTsVn2xZSGYFx28bNO 4/1ozGRcOcwHg8Vzwwr9xfpnHOiBWDj5ANIuk= 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=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=tKwbf0JBf1ZpFh7Qp9tv86T+UgyOTyMl3L2ObtyMzDrA5SMmjIBls1H/2qDqlGbWPx S581wBArMb0Nm0nUA6RniRt1ZDn6rtf0yDHkP3/j1kpLehkIMxCj9+Ig8VUtK0mcPadH B3xNHlDRyeCMQ7jeZ5rv+/2cUforOyX4EcA2aFR8sKwTYCkb91yZJLKsjrDZO07T26MJ JmisaWvH/j0Jvm8abD3W0KvVPPqdBNsDGS0fCMdspuLMD+kVnZmAchOMmJa/kX86aKgE o3hq6100wRaWp7UBX0GcmoOc9PFAiRTTR+QKWuS2JtR04zLAqSzcOF/hBHNCBSHebpR4 HS/g== X-Gm-Message-State: AOUpUlF+IT8caEi2ZPKqOlrJQfkAXQWrmHUEE7i3kZIeuoDXkMefAbe9 WsTW1J6KP/7MUYWAWxn8RIK6Xp8N X-Google-Smtp-Source: AAOMgpcZJ5bjCuXpDJheQ8prBj7kChT1KumAhWhbhnji8e/jH2OBNSGrJNL4YDbyPIySGcM0Krdwiw== X-Received: by 2002:a63:d244:: with SMTP id t4-v6mr317550pgi.335.1533165646364; Wed, 01 Aug 2018 16:20:46 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:45 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Sumit Semwal , Rob Herring , Alistair Strachan , Marissa Wall , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 2/3 v3] Android.common.mk: define HAVE_TIMESPEC_GET Date: Wed, 1 Aug 2018 16:20:37 -0700 Message-Id: <1533165638-13664-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> References: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> From: Sumit Semwal This is a forward port of a patch from the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/ Since https://android-review.googlesource.com/c/718518 added timespec_get() to bionic, mesa3d doesn't build due to redefinition of timespec_get(). Avoid redefinition by defining HAVE_TIMESPEC_GET flag. Test: build and boot tested db820c to UI. Change-Id: I3dcc8034b48785e45cd3fa50e4d9cf2c684694a0 Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov Signed-off-by: Sumit Semwal Signed-off-by: John Stultz --- v2: Conditionalize it for PLATFORM_VERSION Q and higher v3: Rework conditionalization to numbered releases prior to P (9.0) --- Android.common.mk | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..619b216 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,13 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +# This means releases from P and earlier won't need this +ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ From patchwork Wed Aug 1 23:20:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 143322 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458979ljj; Wed, 1 Aug 2018 16:20:48 -0700 (PDT) X-Received: by 2002:a62:4083:: with SMTP id f3-v6mr337707pfd.229.1533165648842; Wed, 01 Aug 2018 16:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165648; cv=none; d=google.com; s=arc-20160816; b=eImF6V+QO0jcyIJcGi1WUyBWqUm6GUkv/5lm3Ja47SmpGWNpDCnYQR6jonsZ8HE7j/ e5VPB/ym0eGlqMuwOeVpAq8v2lUdHec3+L+fUJJ6EDcOQic6yv7t/buubIJSwGrVVQQT 5BY7yl19FyPosvO2+rukt0wRM7gfmeXUj2yLTzYR0SC3RN3altRqpyiM38K4tWFiFuzb /4XKaSI1ltZWL0LciTZoH7GGi4oAcG/g4sxKYPngzL7eTMuKHBq8gCS/PG0hyTg0PdhW GlAMJJVeR1b3AaGpCLY3BJlWJQdKifEG5m1vgRj9F98ljXv9kU35zJhI+vjLiJqf5n86 lV+Q== 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=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=zNMK6XZiJ/I2JgQm1TCoo1NQmcV81PLt1sAUynwIl5/k3qPuUnKOGhLyjg/iXeNAYw uoisJiWkeKG8kpxFCNrn30N3pJjpEpUUMINhZ+sTaV9TYCM5TgF8Msi/kQWZQXM708pp WOiPgW0hxCWsbVwtUOLuE1vkF+oieLBqNKleI8K3Kfwh/rtjAiGnvB5XUAKsdZxW/LFY Y+J8GGyMMeJAnGEQ2kpHMdvY1KNLR4A32zKJUk243wt6b6nZImRIPwNB8tfRbONf8FD6 DrOYDGsXde+2bKm8nbH+Ef0bi5LtXmiioJYPzDgD+TYpryOdFikBeI7b1GL6s6t3bL7C GSJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VKXf0b3m; 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 b10-v6sor66237pla.73.2018.08.01.16.20.48 for (Google Transport Security); Wed, 01 Aug 2018 16:20:48 -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=VKXf0b3m; 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=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=VKXf0b3mybCtSTJKQidDb8Ky2SDAshL74bHj7HVtlz0U3/KqF5MzhnTpz4w9A8e5ZF 5x/2STGzkQrW16vF1B0hpc7SUueo9cVzXarDTuth67uc9R9X+UltIU0r+NUdTIWATn1q /ZJJb/jgumDMPvWfCQ7E7a1ECEQLgvik7D/3Q= 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=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=O/+XxCx3n5zSfhiYMu+MPPle3zIjVKZh7f/ftKLQDSQEZLWEPrt9UVeseM9LqqeO00 h+O+NWtZ7FAJMT5iqlJQHY/LOfwzuIIcejDccEBq34ZTdINtI+0qjW/Twq4Kf2ATBuaE nh9pvkAcfEY325bBDRhN2GNFGjyQW/2odw62p2eJLDfwUJpwqdlcHcJLm5IRweUFCrw1 hKVBSX0j0nK/Pmm+T6+G/RO0UCldzrejHZL7FsWPNG501I1SNmJbQAegZBokNRPcTTSv FLUmhCqopyj2yiubxuvUaZAjVqmt+iuuGGZf2+1aWhfEnnArYq2c+apZAsrY48TjA7Gi reqw== X-Gm-Message-State: AOUpUlEVqIGwothK+JAmAt+dwtjmh5iQtKCPbFOPiPyKCllFbV2WxS7W xPAPVApq308x4jqPNrlOs/waFGzo X-Google-Smtp-Source: AAOMgpfiWui3WUPTA8+KHLzHjkDCXVf90cf1zGOyscN4m1ZPv7Wf602pV40fgSh+2/62kAlNnvyWVw== X-Received: by 2002:a17:902:8482:: with SMTP id c2-v6mr279312plo.45.1533165648344; Wed, 01 Aug 2018 16:20:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:47 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Dan Willemsen , Rob Herring , Alistair Strachan , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 3/3 v3] CleanSpec.mk: Remove HOST_OUT_release Date: Wed, 1 Aug 2018 16:20:38 -0700 Message-Id: <1533165638-13664-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> References: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> From: Dan Willemsen This is a forward port of a patch from the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/bd633f11de0c6ac1ed333a28344c74fd9898df9e%5E%21/ Which replaces HOST_OUT_release with HOST_OUT As per Dan's explanation, the current code was incorrect to use $(HOST_OUT_release) as $(HOST_OUT) will be set properly for whether the current build that's being cleaned during incrementals is using host debug or release builds. Additionally Dan noted it was incredibly uncommon to use a debug host build, as there was never a shortcut and one had to set an environment variable manually. Thus it was rarely if ever tested. Change-Id: I7972c0a50fa3520dcfa962d6dd7e602bfe22368d Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov Signed-off-by: John Stultz --- v2: Add more justification to the commit message --- CleanSpec.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/CleanSpec.mk b/CleanSpec.mk index d08b0de..e5030ce 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -10,7 +10,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_interm $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/mesa_*_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/glsl_compiler_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)