diff options
| author | 2016-10-10 22:00:57 +0000 | |
|---|---|---|
| committer | 2016-10-10 22:00:57 +0000 | |
| commit | b48bc88b75dbba55d77543bf6c87f4909366a61a (patch) | |
| tree | 863eab6a124a68fe4b404594f14d295b70c1ec54 | |
| parent | 38bfdb02db1720da56526944e4ab3a968dc06be1 (diff) | |
| parent | 0ef01bab396b11079dc617873f356f571fc006ed (diff) | |
Merge "Rely on the platform -std default." am: 53b6fc5ddc
am: 0ef01bab39
Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353
| -rw-r--r-- | libs/binder/tests/Android.bp | 1 | ||||
| -rw-r--r-- | libs/input/tests/Android.bp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index e354b11f6d..4f77eed7ad 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp @@ -46,7 +46,6 @@ cc_test { "-g", "-Wall", "-Werror", - "-std=c++11", "-Wno-missing-field-initializers", "-Wno-sign-compare", "-O3", diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp index f0b5edaf66..029a42091e 100644 --- a/libs/input/tests/Android.bp +++ b/libs/input/tests/Android.bp @@ -23,7 +23,6 @@ cc_library_static { name: "StructLayout_test", srcs: ["StructLayout_test.cpp"], cflags: [ - "-std=c++11", "-O0", ], } diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 08115ead61..90c12accaf 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -107,7 +107,6 @@ else endif LOCAL_CFLAGS += -fvisibility=hidden -Werror=format -LOCAL_CFLAGS += -std=c++14 LOCAL_STATIC_LIBRARIES := libvkjson LOCAL_SHARED_LIBRARIES := \ @@ -140,7 +139,6 @@ LOCAL_CLANG := true LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\" -LOCAL_CPPFLAGS := -std=c++14 LOCAL_INIT_RC := surfaceflinger.rc @@ -183,7 +181,6 @@ include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\" -LOCAL_CPPFLAGS := -std=c++14 LOCAL_SRC_FILES := \ DdmConnection.cpp |