diff options
| author | Elliott Hughes <enh@google.com> | 2018-12-03 09:02:18 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-12-03 09:02:18 -0800 |
| commit | 3c59cb8420ba9dc9c81e2d8a55cb0e884403dfc0 (patch) | |
| tree | 649313b64707ccacb27b38e51e509b0d13a15cf5 | |
| parent | 67fe6f09d571401f5aff8c4ad4f814cb95089366 (diff) | |
| download | system_core-3c59cb8420ba9dc9c81e2d8a55cb0e884403dfc0.tar.gz system_core-3c59cb8420ba9dc9c81e2d8a55cb0e884403dfc0.tar.bz2 system_core-3c59cb8420ba9dc9c81e2d8a55cb0e884403dfc0.zip | |
C++17 is the default now.
Test: builds
Change-Id: I6814455e9ad2cdcf99ad66de38a3ad0bfb440d80
| -rw-r--r-- | adb/Android.bp | 3 | ||||
| -rw-r--r-- | debuggerd/Android.bp | 1 | ||||
| -rw-r--r-- | fastboot/Android.bp | 3 | ||||
| -rw-r--r-- | fs_mgr/Android.bp | 3 | ||||
| -rw-r--r-- | init/Android.mk | 1 |
5 files changed, 1 insertions, 10 deletions
diff --git a/adb/Android.bp b/adb/Android.bp index e994075d9..ae8e386e4 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -25,7 +25,6 @@ cc_defaults { "-Wvla", ], rtti: true, - cpp_std: "gnu++17", use_version_lib: true, @@ -72,7 +71,7 @@ cc_defaults { "-DUNICODE=1", "-D_UNICODE=1", - // -std=gnu++11 doesn't set _GNU_SOURCE on Windows. + // Unlike on Linux, -std=gnu++ doesn't set _GNU_SOURCE on Windows. "-D_GNU_SOURCE", // MinGW hides some things behind _POSIX_SOURCE. diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 03b328727..d9fae5275 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -9,7 +9,6 @@ cc_defaults { "-Wno-nullability-completeness", "-Os", ], - cpp_std: "gnu++17", local_include_dirs: ["include"], } diff --git a/fastboot/Android.bp b/fastboot/Android.bp index 8006c41f9..ead21054c 100644 --- a/fastboot/Android.bp +++ b/fastboot/Android.bp @@ -144,8 +144,6 @@ cc_binary { static_libs: [ "libhealthhalutils", ], - - cpp_std: "c++17", } cc_defaults { @@ -212,7 +210,6 @@ cc_library_host_static { name: "libfastboot", defaults: ["fastboot_host_defaults"], - cpp_std: "c++17", srcs: [ "bootimg_utils.cpp", "fastboot.cpp", diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index f150af327..99231acf8 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -25,9 +25,6 @@ cc_defaults { "-Werror", "-Wno-unused-variable", ], - cppflags: [ - "-std=gnu++1z", - ], } cc_library { diff --git a/init/Android.mk b/init/Android.mk index 69f1d87da..0e6ee0b59 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -35,7 +35,6 @@ init_cflags += \ -Wall -Wextra \ -Wno-unused-parameter \ -Werror \ - -std=gnu++1z \ # -- |