Skip to content

Commit

Permalink
Revert "Fix build failures in Ubuntu 21.10 (#22952)"
Browse files Browse the repository at this point in the history 
This reverts commit 61f9b3e.
  • Loading branch information
@adeebshihadeh
adeebshihadeh committed Nov 17, 2021
1 parent 61f9b3e commit 5e2570d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion SConstruct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ env = Environment(
"-Wno-inconsistent-missing-override",
"-Wno-c99-designator",
"-Wno-reorder-init-list",
"-Wno-error=unused-but-set-variable",
] + cflags + ccflags,

CPPPATH=cpppath + [
Expand Down
2 changes: 0 additions & 2 deletions selfdrive/ui/navd/route_engine.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include <optional>

#include <QThread>
#include <QGeoCoordinate>
#include <QGeoManeuver>
Expand Down
1 change: 0 additions & 1 deletion selfdrive/ui/ui.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <map>
#include <memory>
#include <string>
#include <optional>

#include <QObject>
#include <QTimer>
Expand Down

2 comments on commit 5e2570d

@JMPZ11
Copy link
Contributor

@JMPZ11 JMPZ11 commented on 5e2570d Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I ask what the problem was? Did you want me to use a different approach, or are you working on it?
Thanks!

@adeebshihadeh
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted since all the comma three tests failed, but seems this was due to those devices hitting OOM conditions due to the full rebuild. Reverted the revert.

Please sign in to comment.