diff options
| author |   Tim Murray <timmurray@google.com> | 2014-07-24 21:27:56 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 21:27:56 +0000 |
| commit | 5d44dfe005a615db689ddc1851d4855a8a44c6b8 (patch) | |
| tree | 9f7b50248421b5d2b40202cc24676174a10e1324 | |
| parent | ed40eac86a7035365b768ae71443c1bd8d47b72e (diff) | |
| parent | ea3bc5caac38ccfd59c4fba957b4102e049e8f9f (diff) | |
| download | latinime-5d44dfe005a615db689ddc1851d4855a8a44c6b8.tar.gz latinime-5d44dfe005a615db689ddc1851d4855a8a44c6b8.tar.xz latinime-5d44dfe005a615db689ddc1851d4855a8a44c6b8.zip | |
am ea3bc5ca: am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
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 |