tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "versioner: Ignore if Clang is missing"

Browse source 
am: 3e3364a89d

Change-Id: I8e4d498c5838bc2049d0070ddcb1924a3fe913f8
This commit is contained in:
Andreas Gampe 2016-08-13 03:33:41 +00:00 committed by android-build-merger
commit 6a2f9e6ad3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/versioner/src/Android.mk
View file

@ -3,8 +3,11 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS) include $(CLEAR_TBLGEN_VARS)
LLVM_ROOT_PATH := external/llvm # Only do this when Clang is available.
CLANG_ROOT_PATH := external/clang CLANG_ROOT_PATH := external/clang
ifneq ($(wildcard $(CLANG_ROOT_PATH)/clang.mk),)
LLVM_ROOT_PATH := external/llvm
include $(CLANG_ROOT_PATH)/clang.mk include $(CLANG_ROOT_PATH)/clang.mk
LOCAL_MODULE := versioner LOCAL_MODULE := versioner
@ -41,3 +44,5 @@ LOCAL_CPPFLAGS := -std=c++14 -fno-rtti
LOCAL_MODULE_HOST_OS := linux LOCAL_MODULE_HOST_OS := linux
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif