commit 4967a710c84587c654b56c828382219c3937dacb
author Pirama Arumuga Nainar <pirama@google.com> Mon Sep 19 22:19:55 2016 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Thu Oct 06 21:01:10 2016 -0700
tree ae0d585998e15fc175ca3e9146b21e53f290624b
parent d27d7495bf70da4faffda3d8083396e0e07f2931

Update aosp/master Clang for rebase to r275480

Bug: http://b/31320715

This merges commit ac9cc4764cf47a6c3f031687d8592e080c9f5001 from
aosp/dev.

Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)

Change-Id: Ic2875e5c3673c83448cd7d1013861e42947b1b55

shared_clang.mk

diff --git a/shared_clang.mk b/shared_clang.mk
index 038cf65..b6fea10 100644
--- a/shared_clang.mk
+++ b/shared_clang.mk
@@ -21,7 +21,8 @@
 	libclangRewriteFrontend \
 	libclangSema \
 	libclangSerialization \
-	libclangTooling
+	libclangTooling \
+	libclangToolingCore
 
 # host
 include $(CLEAR_VARS)
@@ -37,7 +38,7 @@
 
 LOCAL_SHARED_LIBRARIES := libLLVM
 
-LOCAL_LDLIBS_windows := -limagehlp -lpsapi
+LOCAL_LDLIBS_windows := -limagehlp -lpsapi -lversion
 
 LOCAL_SHARED_LIBRARIES_darwin := libc++
 LOCAL_SHARED_LIBRARIES_linux := libc++