summaryrefslogtreecommitdiffstats
path: root/core/config.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-03-22 07:28:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-22 07:28:41 -0700
commit0e4c317c926a6540d53356dc75e51ca5dd004f0d (patch)
treee5c7ff116c415d035a143617fbf0d603ba5de5ed /core/config.mk
parent80eca91fb532c0b05dafbdb45c6028dfa845b8b0 (diff)
parent1319005a2a47c671d3fa940eb61d2ad34301026f (diff)
downloadbuild-0e4c317c926a6540d53356dc75e51ca5dd004f0d.zip
build-0e4c317c926a6540d53356dc75e51ca5dd004f0d.tar.gz
build-0e4c317c926a6540d53356dc75e51ca5dd004f0d.tar.bz2
Merge "Define a basic llvm-link + clang environment"
Diffstat (limited to 'core/config.mk')
-rw-r--r--core/config.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk
index 56ef97e..6383113 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -372,6 +372,9 @@ HOST_GLOBAL_CPPFLAGS += $(HOST_RELEASE_CPPFLAGS)
TARGET_GLOBAL_CFLAGS += $(TARGET_RELEASE_CFLAGS)
TARGET_GLOBAL_CPPFLAGS += $(TARGET_RELEASE_CPPFLAGS)
+# define llvm tools and global flags
+include $(BUILD_SYSTEM)/llvm_config.mk
+
PREBUILT_IS_PRESENT := $(if $(wildcard prebuilt/Android.mk),true)
# ###############################################################