diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-05 18:25:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 18:25:18 +0000 |
| commit | 16f007f59e9926c722d439ecd84438d6bbfe143e (patch) | |
| tree | e8ed2ff771f878b8ebcb106c1a3730e5dfb05901 | |
| parent | 0fba3982b70eeb53f0aed2025ee17cae39cfb068 (diff) | |
| parent | a96671c1021d0ff0584aff4d562f6b6b574cea31 (diff) | |
| download | android_frameworks_wilhelm-16f007f59e9926c722d439ecd84438d6bbfe143e.tar.gz android_frameworks_wilhelm-16f007f59e9926c722d439ecd84438d6bbfe143e.tar.bz2 android_frameworks_wilhelm-16f007f59e9926c722d439ecd84438d6bbfe143e.zip | |
am a96671c1: am 7fe8bdd1: Merge "Add std=gnu++11 flag to compile .c files as C++."
* commit 'a96671c1021d0ff0584aff4d562f6b6b574cea31':
Add std=gnu++11 flag to compile .c files as C++.
| -rw-r--r-- | src/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Android.mk b/src/Android.mk index 195aaf8..fe244a3 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -169,7 +169,7 @@ LOCAL_C_INCLUDES:= \ frameworks/native/include/media/openmax \ $(call include-path-for, audio-effects) -LOCAL_CFLAGS += -x c++ -Wno-multichar -Wno-invalid-offsetof +LOCAL_CFLAGS += -x c++ -std=gnu++11 -Wno-multichar -Wno-invalid-offsetof LOCAL_STATIC_LIBRARIES += \ libopensles_helper \ @@ -210,7 +210,7 @@ LOCAL_C_INCLUDES:= \ LOCAL_MODULE := libOpenSLES LOCAL_PRELINK_MODULE := false LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -x c++ -DLI_API= -fvisibility=hidden -UNDEBUG \ +LOCAL_CFLAGS += -x c++ -std=gnu++11 -DLI_API= -fvisibility=hidden -UNDEBUG \ -DSL_API='__attribute__((visibility("default")))' LOCAL_SHARED_LIBRARIES := libwilhelm liblog include $(BUILD_SHARED_LIBRARY) @@ -225,7 +225,7 @@ LOCAL_C_INCLUDES:= \ LOCAL_MODULE := libOpenMAXAL LOCAL_PRELINK_MODULE := false LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -x c++ -DLI_API= -fvisibility=hidden -UNDEBUG \ +LOCAL_CFLAGS += -x c++ -std=gnu++11 -DLI_API= -fvisibility=hidden -UNDEBUG \ -DXA_API='__attribute__((visibility("default")))' LOCAL_SHARED_LIBRARIES := libwilhelm liblog include $(BUILD_SHARED_LIBRARY) |