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