diff options
| author | Stephen Hines <srhines@google.com> | 2015-04-01 18:49:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 18:49:26 +0000 |
| commit | 3fa16bd6062e23bcdb82ed4dd965674792e6b761 (patch) | |
| tree | 9348fc507292f7e8715d22d64ce5a32131b4f875 /lib/Target/Android.mk | |
| parent | beed47390a60f6f0c77532b3d3f76bb47ef49423 (diff) | |
| parent | ebe69fe11e48d322045d5949c83283927a0d790b (diff) | |
| download | external_llvm-3fa16bd6062e23bcdb82ed4dd965674792e6b761.zip external_llvm-3fa16bd6062e23bcdb82ed4dd965674792e6b761.tar.gz external_llvm-3fa16bd6062e23bcdb82ed4dd965674792e6b761.tar.bz2 | |
Merge "Update aosp/master LLVM for rebase to r230699."
Diffstat (limited to 'lib/Target/Android.mk')
| -rw-r--r-- | lib/Target/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk index 4494eb0..1e34a85 100644 --- a/lib/Target/Android.mk +++ b/lib/Target/Android.mk @@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) target_SRC_FILES := \ Target.cpp \ TargetIntrinsicInfo.cpp \ - TargetLibraryInfo.cpp \ TargetLoweringObjectFile.cpp \ TargetMachineC.cpp \ TargetMachine.cpp \ @@ -20,6 +19,7 @@ LOCAL_MODULE:= libLLVMTarget LOCAL_MODULE_TAGS := optional include $(LLVM_HOST_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_HOST_STATIC_LIBRARY) # For the device @@ -34,5 +34,6 @@ LOCAL_MODULE:= libLLVMTarget LOCAL_MODULE_TAGS := optional include $(LLVM_DEVICE_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) endif |