aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-12-09 02:01:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-09 02:01:14 +0000
commit3e56b1fcf354735ec133b853e893501ae8342226 (patch)
tree050ce57babdb7feff665248a6b66bbf533c7bd3f
parent8b9998b95437b479a45c2a6e5103ecde55d70a76 (diff)
parenta8b2845744a5a00b596b9716d4d0c7eef5a16ea5 (diff)
downloadclang-3e56b1fcf354735ec133b853e893501ae8342226.tar.gz
Merge "Move FORCE_BUILD_LLVM_COMPONENTS to a defaults module" am: fc720d89b1
am: a8b2845744 Change-Id: I9c9c019cef4fcf90a411d82df12da7e18132bca4
-rw-r--r--Android.bp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index b0d30b5489..64b1f40d12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -165,9 +165,12 @@ genrule {
out: ["clang/Basic/Version.inc"],
}
-llvm_cc_library_shared {
+cc_library_shared {
name: "libclang",
- defaults: ["clang-defaults"],
+ defaults: [
+ "clang-defaults",
+ "force_build_llvm_components",
+ ],
host_supported: true,