diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:05:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:05:05 +0000 |
| commit | c9fcabf1662f2945afd9f3d9d8fb5811dd9ca758 (patch) | |
| tree | 91864c3c2d81b75a15ad3fd7aad5258df2833de8 | |
| parent | e27b01a631092d9cf27aabd3fce94c57303372da (diff) | |
| parent | 2d2391277d4a332c30cd1e89bae62df262041a11 (diff) | |
| download | dalvik-c9fcabf1662f2945afd9f3d9d8fb5811dd9ca758.tar.gz | |
am 2d239127: am 3ef10cde: Merge "Use gnu++11 instead of c++11."
* commit '2d2391277d4a332c30cd1e89bae62df262041a11':
Use gnu++11 instead of c++11.
| -rw-r--r-- | libdex/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libdex/Android.mk b/libdex/Android.mk index 0b805dda3..15e7ba703 100644 --- a/libdex/Android.mk +++ b/libdex/Android.mk @@ -49,6 +49,7 @@ include $(CLEAR_VARS) #LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 LOCAL_SRC_FILES := $(dex_src_files) LOCAL_C_INCLUDES += $(dex_include_files) +LOCAL_CPPFLAGS := -std=gnu++11 LOCAL_STATIC_LIBRARIES := liblog LOCAL_WHOLE_STATIC_LIBRARIES := libziparchive LOCAL_SHARED_LIBRARIES := libutils @@ -69,6 +70,7 @@ endif # !SDK_ONLY include $(CLEAR_VARS) LOCAL_SRC_FILES := $(dex_src_files) LOCAL_C_INCLUDES += $(dex_include_files) +LOCAL_CPPFLAGS := -std=gnu++11 LOCAL_STATIC_LIBRARIES := liblog libutils LOCAL_WHOLE_STATIC_LIBRARIES := libziparchive-host LOCAL_MODULE_TAGS := optional |