diff --git a/.pick_status.json b/.pick_status.json index 953b81ee8e4..e4f94aaa598 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -661,7 +661,7 @@ "description": "Android.mk: Fix gnu++14 related build failures", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index 470ee3ca101..727aaac32dd 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -202,7 +202,7 @@ define m-c-flags endef define filter-c-flags - $(filter-out -std=gnu++17 -std=gnu99 -fno-rtti, \ + $(filter-out -std=gnu++17 -std=gnu++14 -std=gnu99 -fno-rtti, \ $(patsubst -W%,, $1)) endef