commit 5139c4fd28d1a34981d590f2fbec9b407481ea52
author Yohei Yukawa <yukawa@google.com> Wed Oct 01 02:08:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 01 02:08:20 2014 +0000
tree 7bc45bf9626f332d2144e45ae82af0a65f2523a1
parent 7eff88e2ea354685affabca75373872e565b3d99
parent 702a736ede853074993eb286085dd244161c8f29

am 702a736e: am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev

* commit '702a736ede853074993eb286085dd244161c8f29':
  Fix NPE due to the lack of null-check

tools/dicttool/NativeLib.mk

diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 028025d..ffb32ed 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -34,7 +34,6 @@
 LOCAL_MULTILIB := 64
 endif #HOST_JDK_IS_64BIT_VERSION
 
-LOCAL_CLANG := true
 # For C++11
 LOCAL_CFLAGS += -std=c++11