diff options
| author |   Tim Murray <timmurray@google.com> | 2014-07-24 14:21:52 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-07-24 14:21:52 -0700 |
| commit | da9cc77339b18e3624efe99684a4d1511a02a8f9 (patch) | |
| tree | 0d1d609bd9c2992621ddb626c5c1314799578100 /tools/dicttool | |
| parent | 5a289ed29345e545742bc33728d7010b5e2c1e65 (diff) | |
| parent | 159474f2ae5d13308ca1b92b8a5ccd809ec6a450 (diff) | |
| download | latinime-da9cc77339b18e3624efe99684a4d1511a02a8f9.tar.gz latinime-da9cc77339b18e3624efe99684a4d1511a02a8f9.tar.xz latinime-da9cc77339b18e3624efe99684a4d1511a02a8f9.zip | |
resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
Diffstat (limited to 'tools/dicttool')
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk index 028025d91..ffb32edbe 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -34,7 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) LOCAL_MULTILIB := 64 endif #HOST_JDK_IS_64BIT_VERSION -LOCAL_CLANG := true # For C++11 LOCAL_CFLAGS += -std=c++11 |