summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-12-03 23:43:14 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-12-03 23:43:14 +0100
commit4d371e77e1c3267f3d2aba06000eb8c5416de818 (patch)
tree3ef7f1eabc4c83c2f10492550e7e9361e01525df
parentMerge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7 (diff)
parentMerge "C++17 is the default now." (diff)
downloadandroid_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar.gz
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar.bz2
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar.lz
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar.xz
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.tar.zst
android_bootable_recovery-4d371e77e1c3267f3d2aba06000eb8c5416de818.zip
-rw-r--r--Android.bp2
-rw-r--r--minadbd/Android.bp1
2 files changed, 0 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index c28dc3be1..41075d23a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,8 +24,6 @@ cc_defaults {
"-Wall",
"-Werror",
],
-
- cpp_std: "c++17",
}
cc_library {
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 7e33261eb..370232b3f 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -15,7 +15,6 @@
cc_defaults {
name: "minadbd_defaults",
- cpp_std: "gnu++17",
cflags: [
"-DADB_HOST=0",
"-Wall",