diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-22 20:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-22 20:48:59 +0000 |
| commit | a8b6bbfff655d53ed7b1ce794708123c296e21cc (patch) | |
| tree | 95fa9e0f3118753eba16134120389aa4fa8d73a9 | |
| parent | 7d252f952a65e5cfee917258f04596e6cfe57398 (diff) | |
| parent | bf8bc5cd910a03f4e22ec722b07e5c67823e082b (diff) | |
| download | webrtc-lollipop-wear-release.tar.gz | |
Merge "Allow compilation with global C++11."android-wear-5.0.0_r1lollipop-wear-release
| -rw-r--r-- | src/system_wrappers/source/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index 774cc284dd..2f3a281548 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -43,8 +43,8 @@ LOCAL_SRC_FILES := \ trace_posix.cc \ rw_lock_posix.cc -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) |