diff options
author | Shih-wei Liao <sliao@google.com> | 2010-04-28 01:47:00 -0700 |
---|---|---|
committer | Shih-wei Liao <sliao@google.com> | 2010-04-28 01:47:00 -0700 |
commit | 7abe37e4aee38cc79d91dd069a37d7e91d5bef53 (patch) | |
tree | c13b26fc3d8909240f981988535c0b82dd9bf37c /Android.mk | |
parent | 6037a7c3c97b651dd70e48ebe5453134713971ed (diff) | |
download | external_llvm-7abe37e4aee38cc79d91dd069a37d7e91d5bef53.zip external_llvm-7abe37e4aee38cc79d91dd069a37d7e91d5bef53.tar.gz external_llvm-7abe37e4aee38cc79d91dd069a37d7e91d5bef53.tar.bz2 |
Sync upstream to r102410.
Re-turn on sdk.
Change-Id: I91a890863989a67243b4d2dfd1ae09b843ebaeaf
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -1,11 +1,12 @@ -# Only use this on the device or emulator. -ifneq ($(TARGET_SIMULATOR),true) -ifneq ($(TARGET_PRODUCT),sdk) - LOCAL_PATH := $(call my-dir) LLVM_ROOT_PATH := $(LOCAL_PATH) include $(CLEAR_VARS) +# Only use this on the device or emulator. +ifeq ($(TARGET_SIMULATOR),true) +$(error LLVM not suitable for the simulator! $(LOCAL_PATH)) +endif + subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ lib/System \ lib/Support \ @@ -13,8 +14,11 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ lib/VMCore \ lib/Bitcode/Reader \ lib/Analysis \ + lib/Analysis/IPA \ + lib/Transforms/IPO \ lib/Transforms/Utils \ lib/Transforms/Scalar \ + lib/Transforms/InstCombine \ lib/CodeGen \ lib/CodeGen/SelectionDAG \ lib/CodeGen/AsmPrinter \ @@ -36,6 +40,3 @@ LLVM_GEN_INTRINSICS_MK := $(LOCAL_PATH)/llvm-gen-intrinsics.mk LLVM_TBLGEN_RULES_MK := $(LOCAL_PATH)/tblgen-rules.mk include $(subdirs) - -endif # TARGET_PRODUCT != sdk -endif # TARGET_SIMULATOR != true |