From 8a54f3e1f79c1e57e76a1cc53c6c5697374ea7b5 Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Fri, 4 Jun 2010 12:34:56 -0700 Subject: Initial slang. Change-Id: I4f84a741e5fbc440cd4c251406d2b611a237f713 --- Android.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index cf684a8..3044936 100644 --- a/Android.mk +++ b/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir) LLVM_ROOT_PATH := $(LOCAL_PATH) LLVM_ENABLE_ASSERTION := true + include $(CLEAR_VARS) # Only use this on the device or emulator. @@ -12,6 +13,7 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ utils/TableGen \ lib/VMCore \ lib/Bitcode/Reader \ + lib/Bitcode/Writer \ lib/Analysis \ lib/Analysis/IPA \ lib/Transforms/IPO \ @@ -33,15 +35,10 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ lib/ExecutionEngine/JIT \ lib/MC \ lib/MC/MCParser \ + tools/clang \ )) -TBLGEN := $(HOST_OUT_EXECUTABLES)/tblgen$(HOST_EXECUTABLE_SUFFIX) - -CLEAR_TBLGEN_VARS := $(LOCAL_PATH)/clear_tblgen_vars.mk -LLVM_HOST_BUILD_MK := $(LOCAL_PATH)/llvm-host-build.mk -LLVM_DEVICE_BUILD_MK := $(LOCAL_PATH)/llvm-device-build.mk -LLVM_GEN_INTRINSICS_MK := $(LOCAL_PATH)/llvm-gen-intrinsics.mk -LLVM_TBLGEN_RULES_MK := $(LOCAL_PATH)/tblgen-rules.mk +include $(LOCAL_PATH)/llvm.mk include $(subdirs) -- cgit v1.1