From patchwork Tue Jul 24 23:21: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: 142835 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141198ljj; Tue, 24 Jul 2018 16:21:50 -0700 (PDT) X-Received: by 2002:a62:9f85:: with SMTP id v5-v6mr19632094pfk.27.1532474510115; Tue, 24 Jul 2018 16:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474510; cv=none; d=google.com; s=arc-20160816; b=UHhf8gjYn13MU9Rjl7z2A7mnCPkLLXek5hpsSU+pOgxgCVhhFLOPfYeLGn+mWU81PZ 75iQKcJ6nLtM1W1naoW9Bn0jabGA4iZ6cvtB5SMYRPaSzfWBvIRqZTw4Lf7oYMCLATUY /C1MNm+7O685+Iy7ez6bIyRdeK/869DONgybc2l7co8Ay85GUIG2a56j/fmBiqRF7XpA sNCELq1hwl3Sk20bpjy9fJF4hwCZuB4kFk7dlORADHoUC2RCtaVrR+KUV7fFHqc+ILh0 rSfd51mvOIK1NyUPsd1CwgMueW8kIMWgAE3ACzMh/6zEoAwhONY/ny4StYp2J+C6HzPp cKlA== 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=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=tKpkTpFDlz9CNiJWQVe4eEGeS8xRR/Jmy6Dl6ph979z/95b1foVf/fz4d3YHIF1OSv An03AEb1gy8dVye4DrZVQHz35kzASVnviykPadIBW9muPCeZUPaKKjYMcQTrhWbTbkpg qpfqVTtt8IWDmegVWCOBE3HeE0hQPG4BDJi5UYWwvZ2DYLgaKxlG95iaLJanh4Ynd87k EhuchxU6k2ehq+v9x53T9NAORFRELXsk5TG5aYag64NR+IDcQgMmMwwB6ueVj5whMfHl 0TQwUnOkDs0W0NQkbSKUI4tJcIU79H+VLjM9/vI90q1Z9lP7M6XJnm2t1Z5EMM6E3b+Z Okig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lob5p88O; 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 q25-v6sor3679857pfg.46.2018.07.24.16.21.49 for (Google Transport Security); Tue, 24 Jul 2018 16:21:50 -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=Lob5p88O; 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=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=Lob5p88OwiNVXHa6C5qgPmV4M/dukJHrXFNMg3azGAW10KdzVu2iYlXrLyZXCJGDrN Le361agu1FApFNj1OXr0/M7ZfLLkWqd6G49iMLXSd/Fa22+v2b+vQdiAAaNCqAsdHfPb tGfQyqeZYwMwYnDaypVhdwL0u5fNahcXpHKMo= 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=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=O9ofK1Q8h5I2w3cSRTTpLhU42bkO1vvG99nf0UGs/Im7XLV4Q2AUMi/MNvqO8SQ2Gk Hq9TlRHG0kC0UPsiaKqy4qmRtQijByPlwrgzjrVQhNRobUP2zzEMPKF3vJVuPcRapWnV 4HmCJlpzMqCQOsYJaTNgarmE9fhdWQoR/DpWaQDSAxW3c3OFOj+lCGGBiSBJEpw+zZRs 3SplTSlhH9F4PnqSDBcUo7R+qNM1jl+TjFM6c9z8jpm9l9KO2qaJXx+/VJ7bRcuSP8M0 F51l4OgXO6I2XUpDhBDdwh2B2wTqS25E8nz6PsK+f98h6A1wLFof2GKNzURkqcNzpxvH UUBQ== X-Gm-Message-State: AOUpUlGIGraEoH0eIPHuVEoCCZOL+8qAwK3CaATcY8YWp+KUpn/Y5pk1 t2pymrRJ1Qj11LQcsEFSJV1tm13PZam9RQ== X-Google-Smtp-Source: AAOMgpfpvzMEo58h0X2VwKjYRlihV5NhP8yC9GVV2kI0B4hkuBvx3yVpPC32A3QBaDB2YJMUF8/48w== X-Received: by 2002:a62:1e81:: with SMTP id e123-v6mr19867650pfe.24.1532474509599; Tue, 24 Jul 2018 16:21:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:48 -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: [RFC][PATCH 1/5] util: Android.mk: Convert implicit rules to static pattern rules Date: Tue, 24 Jul 2018 16:21:38 -0700 Message-Id: <1532474502-17657-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> 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! Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark 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 Tue Jul 24 23:21:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142836 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141218ljj; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) X-Received: by 2002:a62:a119:: with SMTP id b25-v6mr19411508pff.163.1532474511710; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474511; cv=none; d=google.com; s=arc-20160816; b=uXdoG0XIjrfePBhkVcvgFLr9ynmCHhGv5TMFtUDnSm8RjspCuypDpJ/h8gHDc3hmwL +UfMvFeQEEM0QcWMyg0yel0CbTmNuWivz/xcDtgFTPJAy3uht/3oDorh75vc/8kgZUz8 Gv8hYwNGioVBzu1hUKk2S/sq66hlN3C7ztvaPs5TFCFGQoC+A6tPfywGtkvLr2USQLam prWqkelta+MuObpvXGBXJldbi5VdGYm0qyNB19SM9BppDhD4F1e1GM24QWCJA4vd6qdQ kruS0fqfzMxdXrEmSg09QlIIWyd2GjMZYOLulLBCOYlE6/wutwp8fFa5MaBROTjFabQA sgIQ== 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=CjHG0k2aLDhrisc6deh/4zz9BId9wFbrdi/8mo8SBFXNLL9GnlQz5Mni+d5e8nIs/t H5dRFz2ITX6aFz4Y5nT5zymNt5vJtjPJNehUh+QkHy1g0w0E0HwBaVn+VES9LJhDHKQj ebk5LcGAIOpruq3wECaoHcyNjIGkVeWJbvEFcCbZYKs5PZMs6fT2H4KI17hEQe0ccrnR 4cpBkFvPw9JkOSSXd1ACoVfp6pwysJZHuXAmQvxrSofdhnnoGlJjfwwas1DK/1CyFCDl dg1T0Ivbcu/NufevFskReO8/kS+P+TQgWG1tSHJgbJJQI4aaks/9Ff+eWzz0N1AGKI5w y/BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VQc/qdxT"; 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 a15-v6sor3514314pgh.229.2018.07.24.16.21.51 for (Google Transport Security); Tue, 24 Jul 2018 16:21:51 -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="VQc/qdxT"; 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=VQc/qdxTCP8INT4cfIIDmj6B1XXrdFVnatZQ/BnMxTGijHmtoTrPL52fq423ZzNHiP RNDBDxceS05U/2Lcb3IpBrUZoIErZ/PkM62whInKFzqNJ85XOyOCUt+fdZM0ND79gRMJ HKa9e95r8UdblKO9T6wc4Dw04dNF25Org2eUU= 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=bburHbf3wYNfckGMyIYRkZFMCo5wEbTEHj8AwAvWPCAllcJneje86Xo0l+okKFUOcY ilzqqRWiUeyjDtFS+eq6+ej/TpfJ0CBLRU9tu6iUrAhP67vJXhClv+ntXWg+ftPaADpU A1jPKMNksCKhFz98TdGVLkcc3goqJW3+UoSN8Fby0XIy5DBUAXFimOpVvlDG3VtbIC39 FtxrGtrmJFjBMCrzzp0+sH0Fm2Cz+7XSqg+/9oQ38flncjDDPHdpAWM0ZMuRe4QPRO7N a6obzEVYjiiISAL1SYmNXNqZwWkg2tfyK/1xx+hqLLXHx7yp45y0Yg1q8T8rADuicLdV lpRA== X-Gm-Message-State: AOUpUlGfmaA5ZMVqXQ4cS6UBCajxJRL9KGhUY4ChZ4/ddObWxFg/VLRX Z+ZGY53RGLfqtOXvrWJwqHXjjigW X-Google-Smtp-Source: AAOMgpfwpmRlagRY5hfA+QDHjJaqZOQPwSnzmJpQgWwS1vF7u9ebcqrIDL/ZXT6QpM0zmdfk833/Og== X-Received: by 2002:a62:c505:: with SMTP id j5-v6mr19216236pfg.153.1532474511193; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:50 -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: [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET Date: Tue, 24 Jul 2018 16:21:39 -0700 Message-Id: <1532474502-17657-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-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 Signed-off-by: Sumit Semwal Signed-off-by: John Stultz --- Android.common.mk | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..e7828af 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,10 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ From patchwork Tue Jul 24 23:21:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142837 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141226ljj; Tue, 24 Jul 2018 16:21:53 -0700 (PDT) X-Received: by 2002:a17:902:530a:: with SMTP id b10-v6mr19054843pli.316.1532474513465; Tue, 24 Jul 2018 16:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474513; cv=none; d=google.com; s=arc-20160816; b=rKVdu1ZyhzcAWY7kFo0on5fbhhHod/ZaVpRUazMTXdqWFwWf5XBYovrBK2y9Qg7465 YeTzkOevCkcz1LHyj3yBOyxT6wwU4hLY3F1SpqwynRVRrNq/pbEWz5JmlEQbZO1UcZ1R Db7wpHEFnnDxndzp26kEOn6NUU46oGj3ib1Yo7Vawt28QGzyEc3GK7D8rHClic+CADv4 1uKmtE+u4bPBf1jLuQpekRz5ubTKFCgSWfYFGfs9zFtuffhKdYr4pCsm2zF38IhzweUx MG8GRFNf8BxxVB6+MZSBj6X3c4o1NHx1EJQP911LAAPqimUU04tPa6jaxSq+vg88PrX4 dhYA== 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=rP2vORtLWV0TivgpyPWc79Ia6VMsLb1tuWHf8U2ZrYo=; b=Jhs0dN1MDzVxJGLfXo7AJ5VDIEmAukjcWbxWRYKwwQAFL+DHkGcIFlyyT5cYJtKIQa JtNVOQhqLOmTngOyFQbJ57sDOD5KBkO9Yjs+mHeswt1qWzLvRzQesEpZJ1MDxX3Mhl8t KYxvsy46UrUyoA8nkzuwl565Jn9VZOt9Whk/3Ed1B/9E8T6TC61/CSqB1D25VqVfkc2P HRBCDXF7tSNbdBE/AMvyDaEi2uuUmZ7e0wWuY0xrc9nSML35R4ntfFMaNV7wuQug4UTx qcoIztfRviLgn9p4uRzQMbhGfNIY3EKYIUuG1VRcSLHcgWYL7GBm6JIkJdNgD7SM08HT 3AXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qg6HOAn7; 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 y4-v6sor3680972pfm.45.2018.07.24.16.21.53 for (Google Transport Security); Tue, 24 Jul 2018 16:21:53 -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=Qg6HOAn7; 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=rP2vORtLWV0TivgpyPWc79Ia6VMsLb1tuWHf8U2ZrYo=; b=Qg6HOAn7j6j0voJN7c7ICIyKhh2GvJhNbxjvK9+cMz/YCbJTW1sj4hYB0K4iw+ynY5 kif0eBVITfNQuBjzNHCJrADfhh0Nr4ML2NeGDJ8WF0hh2tuG1ekCoG+/x43lHU0sVVSZ aLzxLYKYBRj50szhHBZ24CbMesi01N0BgEpLM= 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=rP2vORtLWV0TivgpyPWc79Ia6VMsLb1tuWHf8U2ZrYo=; b=R5vVmgUvi8hUZmYomppw2p2tU+/GVHwmlOQL7P0/n9bR1T13Esn6D6tV91oVV/6F6K DJgEkLnSptQHOtoxXd24JXfZU3pzoQe5ZBTgTXKTlbbqqYsikauV5kvX1nwdYTw1kM4T G8DPe5QI2XXl2J/apjZ1cFeYIt+ucUPA+VgDcv3+myzq2fzdOCInMBNizIQtkfzuchk3 wSLXVaYGCtd5lRTy5622kIVuPlELoY2TDqu8gv19gnpKWcG+V2zIKbtdUV7JRdHEx3+3 PzfdajZoPGSs3sC8cb+qUQ/02UDLgkVzY8LQFnwUAaWPDdoEpxY+Kx8E/nVmtbBp0Ddt 0CBw== X-Gm-Message-State: AOUpUlGQSSEN2ICGMJX5nOV0FSXlDVF5dM2myPUZox8IumUdk3dYjHTd 5WYfCfYnWmVeCNtIRaLbOoTjCod3 X-Google-Smtp-Source: AAOMgpfAyi3khDoYchmaSW/ird3sBzT0EB7w5bQkAys5tDlwPfC65lXdcTca1SWGeFHHcqA6NKLJVg== X-Received: by 2002:a62:8389:: with SMTP id h131-v6mr19540683pfe.105.1532474512982; Tue, 24 Jul 2018 16:21:52 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:51 -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: [RFC][PATCH 3/5] CleanSpec.mk: Remove HOST_OUT_release Date: Tue, 24 Jul 2018 16:21:40 -0700 Message-Id: <1532474502-17657-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-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 Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Signed-off-by: John Stultz --- 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) From patchwork Tue Jul 24 23:21:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142838 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141241ljj; Tue, 24 Jul 2018 16:21:55 -0700 (PDT) X-Received: by 2002:a17:902:50ec:: with SMTP id c41-v6mr18776305plj.269.1532474515306; Tue, 24 Jul 2018 16:21:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474515; cv=none; d=google.com; s=arc-20160816; b=kse5Zyat8Ww1yA3Iw68ruEHzC52C5DLFgpQaqu3NT+5kZKlhsEdsMffbCJvyPyf+Q6 pHTP/entsVVB496yCHwMWjib6+6ZPYR+StT2YWlWVZel3cLvGYcHOlJmiuaCQCJmutjI mmgBQWKAcD0g20HnpsxFFzZuSflfbbND37+ooQdfa9u41CZyXUqmQBjWpzPCDeQC6AYh D9iTyoJw063xI9DeBCKqWVh4OaQB0DCQf5aXGi7/12FXDk0fgpla7HEfWgp9h3vZo+th Pi2XJQAKoCF/KT8VO1SdcNggE3T88VgYxM67tcHAjReRUOgOumTHjex9WX1S3GFxWiQl /KQQ== 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=ar/TCzfLTUnb5IzaSj/X8NHeTzfMzX0joL0V7LqXMQE=; b=k4kP2KhrRYrwyslw4tjy6fWG+mVhkAbyl776fOUtTzXdssQ4QqHxLQI6ztfOwSlXJB z+I+9ZZg9Amdh7TZlLO97SEmTO2N8hMfWvaNcqncu3fYZ/cDFWgdIpdvZY4M54kQ0De9 5pfMBrimD1HnLmHG3+asQ/ERucpxSsdmPtT05248S+fPaBTYIK70Nu/lfhQu8Spoh5kT isgraquryheZu2m7I3AVY9mV2YYxk+HGMG+5LMvUtrAKeMu4ZSZhS4JLpW5YxGcillXL jqghhXdc+Ec4uCesTl5e+IbnLsdS+VUUUho6ezpLpmu8MR+HkQ60w3wWw5fNPyl89XuE bG+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TwA6yBs2; 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 k20-v6sor2925083pgb.17.2018.07.24.16.21.55 for (Google Transport Security); Tue, 24 Jul 2018 16:21: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=TwA6yBs2; 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=ar/TCzfLTUnb5IzaSj/X8NHeTzfMzX0joL0V7LqXMQE=; b=TwA6yBs2SGQ0yIzc6EztS/WGDUQb8YyQxYFWfGmmfzWMcpZYqeumRQUkb/7hgvfFtn UTt8KDH8jJUZRS2iAyeab9m32v/X5NxGPqMrnEoDTC7Bk2chyVfBdTQC2cXjTc6AU0pF VlVWUlnE4LBl2Ei39PRupXr3si1B+YEIduliM= 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=ar/TCzfLTUnb5IzaSj/X8NHeTzfMzX0joL0V7LqXMQE=; b=ggIe+vlmrrcElFI/+AbEkJTYMTwWHcH/nrqNGJPIQUwYu5+uAm6lKk9r/S+LP3KN8V 2nlAyDB3iPzbG5tGuIXlGuCJ+s/cjrPyE5vfnj1YmIpnq/1fHvBNbpaiUataWaQZQJUj JbvZ8PItR3V9sbrNfgl3FSKugo65rdtcvw6rkVLP/p9dEimvtj67k2ueKPyNBPNlwX/T gVotMY16XFaBTCRo9PB4u1SaV7n7T7Yzx2AUYaq4rr7BKidYdSfudzfDzUcyi/0UbLfB rGL0XrJk6QFze2Hr/Q364WkMN/y/mRn9R+s54mU052sEnK1bwtq59Y+lt7/SXYvHEdZf sjJg== X-Gm-Message-State: AOUpUlFslElXYRHPc4RTtD8cWH0DtI+Ylmm0pijhS3BqVvQ23ZSTA9Lm PqYmzo1KaPTBY8b41C0fkCzcf0jB X-Google-Smtp-Source: AAOMgpcG0GYtjqBOtGOwzvI7KFOUEteD9QI1Y0Z4AENMaYYUz2u9NO/rd2R2W+G6O9HrV1r34mpeog== X-Received: by 2002:a65:5c4b:: with SMTP id v11-v6mr18339465pgr.445.1532474514813; Tue, 24 Jul 2018 16:21:54 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:53 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Yong Yao , Rob Herring , Alistair Strachan , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , Harish Krupo , John Stultz Subject: [RFC][PATCH 4/5] Android.mk: Add option to use vendor version of mesa Date: Tue, 24 Jul 2018 16:21:41 -0700 Message-Id: <1532474502-17657-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> From: Yong Yao This is a forward port of a patch from the AOSP/master branch: https://android.googlesource.com/platform/external/mesa3d/+/b1e5fad1db4c1d51c7ae3a033b100a8429ae5415%5E%21/ Which allows boards to provide their own custom copy of mesa. Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Signed-off-by: Harish Krupo Signed-off-by: Yong Yao Signed-off-by: John Stultz --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/Android.mk b/Android.mk index 914854c..494b4b9 100644 --- a/Android.mk +++ b/Android.mk @@ -29,6 +29,7 @@ # The main target is libGLES_mesa. For each classic driver enabled, a DRI # module will also be built. DRI modules will be loaded by libGLES_mesa. +ifneq ($(BOARD_USE_CUSTOMIZED_MESA), true) MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) @@ -125,3 +126,5 @@ SUBDIRS := \ INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) INC_DIRS += $(call all-named-subdir-makefiles,src/gallium) include $(INC_DIRS) + +endif From patchwork Tue Jul 24 23:21:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142839 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141262ljj; Tue, 24 Jul 2018 16:21:56 -0700 (PDT) X-Received: by 2002:a62:ed5:: with SMTP id 82-v6mr19695359pfo.198.1532474516810; Tue, 24 Jul 2018 16:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474516; cv=none; d=google.com; s=arc-20160816; b=BiyinoZQ8lz2aW4TEBuV5hOm7UR9AbsL++qmjzBgt+3/gXDe5vkJBn6450pd1mGk4/ 7WIYKQl99BHTxLKKorffQq96wC5k6Pj0cWMGFt0d80j/TLSSPyjZzg5H3pLL1e1g67QJ y227rbqQVtLP6mslx6bB/WUTzwZjW5LdYxmYofrS0GS8kGRrI25hqeqGGyXCGsLiN/Sd jIakU2Lb2kQEfDgT9lnNCOCCi1L8ADRzoQ40imoNHf+wZ5SYIEVgaoljgy3tQ40H8PsE 9hnJxn+rFNc302Bmw3yRj6MQYW5FMDBt7kCcirFl6iJpWPUTOHvOFUcsTKTEuI3ehqEf D5VA== 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=sb7dJWkuLgxA30F0hIhM0Kj+B2o8Ar6P0hLREGgugUM=; b=gdZgifV3+PlghLrBdH3CBJ/2razPVZm7acp21xHVxKDySNlGYamoZfq4gdttYaho0S 3OUg0+QajqVQ08m0KvUIc9ruIBCn3rBfISw4FfA0Tu1bI7fv91vJr8GuSNR/X5NtAu7+ u3jgPoMTB3IKv3/yyaThYJeE7EmqW57Cg1maUYi9wuF7b6LuzlU3gBIor39dnNwf2ljw fiCrOLlPgdWZjV3OoDkBvFOjN75BGiqoE6sGbBpZEdaK+BXi0j5E9pd9w3eOIW5HJEjG JDpBBM+OjnWgsU9IsFoy+vDji7hbgFoFvduSJOBk8UbdU3QcRWQVB2V9lhSlPiBG2QY7 +J9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LHpe1pR2; 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 17-v6sor3196684pgp.145.2018.07.24.16.21.56 for (Google Transport Security); Tue, 24 Jul 2018 16:21:56 -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=LHpe1pR2; 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=sb7dJWkuLgxA30F0hIhM0Kj+B2o8Ar6P0hLREGgugUM=; b=LHpe1pR2OGg4TPEa2vaVq9RiEudEOoMUdPfC/PRqDcEPJg3KTNmnOgrrdgUuBzxBh8 KHChXLvko+YEKRTWQF+UGZ4ZHBS6TljinkHBCegzH3+wD/jKrdnb4lMzHPXEwyqLfWhC VbxhfsgULHo4EMhnCKahvndpoPdK3eG7v9gOw= 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=sb7dJWkuLgxA30F0hIhM0Kj+B2o8Ar6P0hLREGgugUM=; b=L0Yqiq8eM4lfz/otDRCg1IY1auuaKs+LWNBnuNsbv9SEERScobaiLuB40Kgfe1OOfp 11mUObhmPTnsyOyEbmhCioG8QpXjn92MFW4n99wg4VjEClDjgdE2aID+ulJ8FetMHcL1 TaRZgX07riNX6YhIoy2IcjoXegPAbfJxrJG1WlOg+J1hz1FYO/RgtyXDgP5irAJab7XC gq6I7Hn9BxjzKIUheqEgq/+XelcImQ8gaOI13B5AEHOzaZ2N+Sd4Mhc0xsisiBF0dLrE H0HLbwpo6KFjww0kmbiVNs1cMcRTkF+vYg/hxTVqvMKbZAtislyxYl+IVrKTUgxjOdz+ ndmA== X-Gm-Message-State: AOUpUlGuVL9K6uvuHrZIYlvkMYxXsTcE8uL5abfGW41uhz3UC8fNC3K/ aSf6I5p6uDngvJLnYax4c58Ey7srQ2/yHg== X-Google-Smtp-Source: AAOMgpeb3yWJXETzuQTgAovCIDAdrMSJRdJE8pJ33vps+XADj/eR8+3QFVMXJUNOd98QTmTONHicIw== X-Received: by 2002:a63:a042:: with SMTP id u2-v6mr17796273pgn.80.1532474516328; Tue, 24 Jul 2018 16:21:56 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:55 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Alistair Strachan , Rob Herring , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , John Stultz Subject: [RFC][PATCH 5/5] Android.mk: Fix checkbuild on Mac builders. Date: Tue, 24 Jul 2018 16:21:42 -0700 Message-Id: <1532474502-17657-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> From: Alistair Strachan This is a forward port of a patch in the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/d7f894a7d39e66ca5a832c19edaf175400041aff%5E%21/ The libmesa_dri_common target depends on xgettext unconditionally, but this is not a documented dependency of AOSP and is not installed on the Mac builders, so we must not build any part of mesa3d on these platforms. Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Signed-off-by: Alistair Strachan Signed-off-by: John Stultz --- Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/Android.mk b/Android.mk index 494b4b9..128db4d 100644 --- a/Android.mk +++ b/Android.mk @@ -30,6 +30,8 @@ # module will also be built. DRI modules will be loaded by libGLES_mesa. ifneq ($(BOARD_USE_CUSTOMIZED_MESA), true) +ifneq ($(BOARD_GPU_DRIVERS),) + MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) @@ -127,4 +129,5 @@ INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) INC_DIRS += $(call all-named-subdir-makefiles,src/gallium) include $(INC_DIRS) -endif +endif # BOARD_GPU_DRIVERS != "" +endif # BOARD_USE_CUSTOMIZED_MESA != true