diff options
| author |   Tim Murray <timmurray@google.com> | 2015-03-20 23:19:19 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 23:19:19 +0000 |
| commit | 052556d16bc75cf842a09ab66f00917f56eae8d1 (patch) | |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | c84e354cfdd3380acbbd086c1f40511afa79e9ae (diff) | |
| parent | da9cc77339b18e3624efe99684a4d1511a02a8f9 (diff) | |
| download | latinime-052556d16bc75cf842a09ab66f00917f56eae8d1.tar.gz latinime-052556d16bc75cf842a09ab66f00917f56eae8d1.tar.xz latinime-052556d16bc75cf842a09ab66f00917f56eae8d1.zip | |
am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for 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 |