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