From 64da0060637cce4f24f743437dbada6ab928ded0 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 12 Aug 2016 19:10:21 -0700 Subject: [PATCH] versioner: Ignore if Clang is missing This happens in some branches. Work around for now. Change-Id: I75c01a3ae52ce89f6c56a19728903bf86db0a309 --- tools/versioner/src/Android.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/versioner/src/Android.mk b/tools/versioner/src/Android.mk index dff4f7f96..c43a525d0 100644 --- a/tools/versioner/src/Android.mk +++ b/tools/versioner/src/Android.mk @@ -3,8 +3,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(CLEAR_TBLGEN_VARS) -LLVM_ROOT_PATH := external/llvm +# Only do this when Clang is available. CLANG_ROOT_PATH := external/clang +ifneq ($(wildcard $(CLANG_ROOT_PATH)/clang.mk),) + +LLVM_ROOT_PATH := external/llvm include $(CLANG_ROOT_PATH)/clang.mk LOCAL_MODULE := versioner @@ -41,3 +44,5 @@ LOCAL_CPPFLAGS := -std=c++14 -fno-rtti LOCAL_MODULE_HOST_OS := linux include $(BUILD_HOST_EXECUTABLE) + +endif