diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 10:57:04 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 10:57:04 -0800 |
| commit | 2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f (patch) | |
| tree | f0d6f6180dbd2125193e5f884ae8bf3ad63695cc /Android.mk | |
| parent | eeadbf034b24be2d902b9b6e2950a6e24145e587 (diff) | |
| parent | 8f698b54457858057e2849b43bdeeb4e912f8d3d (diff) | |
| download | external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.zip external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.tar.gz external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.tar.bz2 | |
resolved conflicts for merge of 8f698b54 to master
Change-Id: Ie502ec01a03b2f9a8e015a2b83139f56fd84b91e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -28,6 +28,7 @@ subdirs := \ lib/Transforms/Scalar \ lib/Transforms/Utils \ lib/VMCore \ + utils/FileCheck \ utils/TableGen # ARM Code Generation Libraries |