am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9': Use default compiler flags for dicttool.main
commit
ea3bc5caac
|
@ -34,7 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
|
||||||
LOCAL_MULTILIB := 64
|
LOCAL_MULTILIB := 64
|
||||||
endif #HOST_JDK_IS_64BIT_VERSION
|
endif #HOST_JDK_IS_64BIT_VERSION
|
||||||
|
|
||||||
LOCAL_CLANG := true
|
|
||||||
# For C++11
|
# For C++11
|
||||||
LOCAL_CFLAGS += -std=c++11
|
LOCAL_CFLAGS += -std=c++11
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue