From patchwork Thu Jul 26 18:28:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142992 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778352ljj; Thu, 26 Jul 2018 11:28:54 -0700 (PDT) X-Received: by 2002:a63:4e22:: with SMTP id c34-v6mr3015765pgb.6.1532629733971; Thu, 26 Jul 2018 11:28:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629733; cv=none; d=google.com; s=arc-20160816; b=mN92G4hzzB5po0tSEFPzcpujMg0YW4/CoYci1bS/SfmwIxNQ9k/fbvGEDpFzPjImbF Kwk9n6r/jLrrAPUXBPX32BitOsWOnnnuuukTcvdwkOH0FXsPH40T6BbwtFdn4ZpvwLUB B3ij6QCU+DstiZ78iF4O0SPDpSIX76l+TB68A+vyAWTv9+wdfO2Vw8LPfOsyYG5HukX2 q9Bu8qTR2FjBoykM79FA4J2y6SuKeXP3N2hhzC1BuRIBuj9eJxglIOtAep0nWpZNNssh WZ3QAbSCLmSgjR8MnzGF6EhTnei3DTA8hau6ZVeJHExV8wwdiAmkMf2sbuaWlSjv0Owq 8v2w== 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=hG7RQMRG73zXHSspo+tNxSQ9xuV0PBZG12QayCOvE7BmVlVF1CWvV2T0UxbUUif8Vr yGJGlvuInpdk050tpEBDE/UNn3hGIJDrHyXVj445bPErBtzu+brqVsSMQC1yINeDNpwp mrni3f83Dvo0x+ZyKUTD1PTQCDyLNWtDfa9yisRzdLLwQq2rFmL+dJSuaTt0nfRF6+sC DjrHJpe7h10gWUKZPXzLHFhrI6znvCt0OLf4g0fBe6aDFKsTupvDIy9TGn0/crw0GXgt 7T7cmfWtKceSijuvQ9FRyEvm+UyCUOADDnWM2RTrt1gBSuHNgGgSU9ZoREVw12nXFFTg Cpkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZRghJOEe; 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 a12-v6sor518070pgg.157.2018.07.26.11.28.53 for (Google Transport Security); Thu, 26 Jul 2018 11:28:53 -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=ZRghJOEe; 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=ZRghJOEe7gy8LBUXIdkQpLfRZkZzc74/DyEdmFe+QgFheDwyqjB8Onj0dd6Ogxs7I/ 2qPUirt0h8h9xbzQZJnAm9Cab70h3SQk566P7u0A9F2TFxTv/psrA8sR7pOPs4bqJKS9 eNGz/821DOjIFKUDYou/aBWox7++d27r4f2dQ= 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=HQpqrwdlqHQqnIYf+2NVxhznPaol/nDlDK6ifPTyTLChWl3fWZvvbvF17r+kqwBpuQ 9u6O34GK+SePej6upeFyxjp055/Bx8eus2wEE05wzf2EAh2XagPCMVuCmIw5os/9py9w 6UxnAsH46hVt2DFCzoR9q+lZktB/3q3Ka0V8c1+yF6mN0KiwaejAH+B7jNx4rihZgLdr LwXmh6kJRNrFwjx4wHZeTu3kq9D5GWbCNbFg/l1FS7slLJcAZAsKLvSCZhjJEMBiii8/ 66oD8qih3V77thIQPtS/IALU5HcUDY7qpLo8UUAX610UsNcP5LWyYVPMVRnn7vZwX1uC Y2Gg== X-Gm-Message-State: AOUpUlG0LoyD2bntUmviHhjbZ7Uk1ynciY3N4KNdUNyKpLHn5iJjcjGz m1NuccF0T13okUk9eOy/ec6lUGtk X-Google-Smtp-Source: AAOMgpdu3KYm5FWhi83sRhRABs/zw49Cs+aOniqGfOpCzbwWW6tDw12DVor9MbRLvwmORfX5wFUL1g== X-Received: by 2002:a63:6b86:: with SMTP id g128-v6mr3047899pgc.344.1532629733416; Thu, 26 Jul 2018 11:28:53 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:52 -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 v2] util: Android.mk: Convert implicit rules to static pattern rules Date: Thu, 26 Jul 2018 11:28:44 -0700 Message-Id: <1532629726-17441-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. 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 Thu Jul 26 18:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142993 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778382ljj; Thu, 26 Jul 2018 11:28:55 -0700 (PDT) X-Received: by 2002:a63:8dca:: with SMTP id z193-v6mr2989080pgd.228.1532629735454; Thu, 26 Jul 2018 11:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629735; cv=none; d=google.com; s=arc-20160816; b=Bcx3pCnfZWb0oCNpiJQlxfWtEVuuoP5UskN9EiZ9NzRi2XF0S2D2KUFhS3AM+PnJqP DGGw0QkFu4hk/yvaJLxxBPjSkIKaT3ROIsHOBpP9+29NjSCCkhCv4YmtO1g0bQHKBLPH bk92v/ESrMWFjhhoAMvSTqm1vLts+qZlkI9qOQCcbjD+uRVbQX4R+geVtgSoB4cV/p80 qJc+u4QeyOblYDGKaGSujBILN4kkQfOerpWMLWBHXwukseb8cgSfBVGVwgi0/ufzMWeO WlcLSOOvJO1I8L+iKoxTyFq4nmgHE6MYiofg3XkYkiU3dQlTHvktsJmg1aoG8TExLXJO Qg7Q== 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=FXsgl43xE5EN+SnIP6WN5cou9HiiXW5QN3BtjT0aqs0kCJC3nLXfPLRh1ewBAv+VNm NYQy71HxR0S9vCjX3sV+yiANmmZkVtrhJDrdpbKYCabb2FIBbA1vm7w3UUN6JScIjbwI FmJNQ0HQ1z0bHReP72YrgaPqZhWSvf+OtufuLihPU6/aF8V3xtOP9Wy7sghH6F1fIOY2 NgJjgwB3BpuXeKZKDm1HvOzUZFNEfQwIt8+FK2UxX9uUYplcJvKGFjySBZ8HoEYN+/LC R/7PsdnBbaD2XIAEziN2esKzuB1H6XCyDQlizKyfUL+j6k3tAbxe0qJ3kCEH2iW33Hxv pBLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XxcrSzPs; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id p15-v6sor521319pgh.328.2018.07.26.11.28.55 for (Google Transport Security); Thu, 26 Jul 2018 11:28:55 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XxcrSzPs; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=XxcrSzPsOTNag0FBOG1K7ZhUxX2SWO1ZeVYxRl7Xshgbkhq+yxIl13ufrRrzMgCaiU H76mP7F//IRcOggJep6w2eP2GQTMYCiSGkMMwJcOQnxA2YX8vgdlESIPV3hNrPX8Ituu w6zVFM4fz/MKM1ByhDSDCGa7rzCw+mdMHhjfw= 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=YNezaXdmbXNY84WdJNywEiz1cwH6zYPKobiajie+au65Zf+xlf6qS1TY0bL7yAv2mo PFR0wfqldq7jBYwmfx3/0rTaHY+O63+Q4K7WZtHPPZqVsRjMZVUUvUN1CHyJVhke3AqD XeO2bDxpLK9vcutVVNOwVUwfUjAQmWv7XMMIJXTiN+nTvqfgZsZzzUTnwl/oGbthv2vb B8GpBTPMhaceExm7TDrDkZffCSDg6v93f2vITe0L706l2nrR8Lip/Jq5ZkZMDwl2N6ai YUZiGJ052T4+yRrFsQw3DMYgmSZx8BB5/phpLcJ/ZisBvEU5d5X3F88vAIeu0Mg2c0QV 3jkw== X-Gm-Message-State: AOUpUlFs6z1yHoHDpyYRvLiwZYpeJ2CXhKbkxzqhcCEAo+JpjCO/m5Db Y1hmvnKSrip5aHIRTzfgjpmtO7MJ X-Google-Smtp-Source: AAOMgpey8pRbTnsmP9RYjXK/D8EwkcBlt9PLDm5y10t6ZEDWrc9eEm18k/Xvg9VdwSAOBiGow1hERQ== X-Received: by 2002:a63:eb0e:: with SMTP id t14-v6mr2952066pgh.198.1532629734985; Thu, 26 Jul 2018 11:28:54 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:53 -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 v2] Android.common.mk: define HAVE_TIMESPEC_GET Date: Thu, 26 Jul 2018 11:28:45 -0700 Message-Id: <1532629726-17441-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532629726-17441-1-git-send-email-john.stultz@linaro.org> References: <1532629726-17441-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. 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 --- Android.common.mk | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..3585470 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,12 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +ifneq ($(shell [ "$(MESA_ANDROID_MAJOR_VERSION)" \< "Q" ]; echo $$?),0) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ From patchwork Thu Jul 26 18:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142994 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778411ljj; Thu, 26 Jul 2018 11:28:57 -0700 (PDT) X-Received: by 2002:a62:d8c:: with SMTP id 12-v6mr3249891pfn.202.1532629737380; Thu, 26 Jul 2018 11:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629737; cv=none; d=google.com; s=arc-20160816; b=AEAYJ99TK+bW5b0lIaheu8phR1TsIIqwJtFOZ6/NT60KN7GZhYIB9944DlEXPy3nF7 1aFIRTDpu8J8qT71D2wpPWKhW3uhY4+goNHrqbpXLFnW1MQmq1dDrOyuo0xuQJIcC40r xZwEpZatKgpVXWkBVpEZycdPxdNGaXCb0Br0fCaouz6GDhWUPfUn9fY3NAe7P6bKZtj9 6DaNc8bPJudm6z9vzGGW2KFkWslxf4HijFF4+9PP3u21JqtA5DAZHodPvJINnTKwLZRV ncbS84IvsnBNZkemu7/RbtbAQaDHnqg8J1O1vtRW38AlgxWmjhCMKXT4g9Wz+t2vF+Ji L0xQ== 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=eRrvBQLV7szflqZvqYvfpocq4KBZ3dO2JVRcixjGvf5U44eRbl/Ue23gwmErLMDMrr hEbYnyopyaqP8OW9HBHTkjjklIP+mr6wTgERddSGUR82jpVxll0BkN/LhtuwM2x0VjPD YVR3n1kQdijQUKONWZ+TTAu2iXsDCYvOJZER+UmDHnWa8Ycv/Vx9sUy6hVv4xtWo7d/W nF9tmJ/26R68LiwdmJFNJG6GKGlUR+C/WXNxlyt5s+YySC7e7ZnyLlPveoEuzwqeCXbc JwDLbOtLsKtLa2kLiLPqc6tRIBwRgh7Eih5bAQ2fLQ9R+CxH7pEralQaf1lrv1dnummT Pzmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XEXO/yI8"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id n10-v6sor621844pfj.65.2018.07.26.11.28.57 for (Google Transport Security); Thu, 26 Jul 2018 11:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XEXO/yI8"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=XEXO/yI8pGNwHX3uJKgZXbF/0CDQvUcB/haiYXBv0pZcNeZbKHsobIN6rOTpoLRLj7 pfKGzXrqG236w+C/+qrKWRtYu3W4zHUt6o/SS+mTIVqoQScfZg86cDfP/LFZv+G56Nd4 DeM1vc2xcw6MATX0X0Lshc5v2408vbg5IPtCQ= 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=IClxIhyCRucYsIfIaW6xVc/BcVNsGZhXXz+avMZavQ/CbB7y3kmO9FYbZc6hrkokg8 LEoj6YgIG7nBACXB1KqPKxDlFNK3Qfw92QsNkOiupuLElvmQxRVaq4+im1zBN+vnTF1o T1A0JS0RBzThStU/6BmNCoCJIifR8t3DrsZMCTg59rn4tArXIc+ITtoXupaTUL66zZUL ElJAH1nBYwGpJ8xGzDDzmUT5RVvIaV51/gS8isqwUxkwA1EewkGV6TPrkWxTS3a1fVu/ aoLiSanCSuULYlxP1HyPgj/htx3VKAQ+0oikJVFEFiMGlQ8scB1zuutzIsBfcRh3n6F1 JnFw== X-Gm-Message-State: AOUpUlHcZ1bQ7pceh7sSd2+0mMnfmedkism0oeUoPbQ7OLMEczNu5BF2 WuOAPet9bzQDiMXeeFqgFMm8rDfH X-Google-Smtp-Source: AAOMgpfoF0JHO1hGEMssipTZ3digXDijKUmW8n4QC7NLrgw2oFvujK+0eekk+AVDquIhvjXYYQGHLQ== X-Received: by 2002:a62:c0c4:: with SMTP id g65-v6mr3234970pfk.72.1532629736882; Thu, 26 Jul 2018 11:28:56 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:55 -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 v2] CleanSpec.mk: Remove HOST_OUT_release Date: Thu, 26 Jul 2018 11:28:46 -0700 Message-Id: <1532629726-17441-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532629726-17441-1-git-send-email-john.stultz@linaro.org> References: <1532629726-17441-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. 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)