Remove GYP->Bazel conversion helper
Change-Id: Ic3006096a3738c834648c9cdc4da7cf0f224643a
diff --git a/aos/common/controls/polytope.h b/aos/common/controls/polytope.h
index 1ca1ec6..4efa628 100644
--- a/aos/common/controls/polytope.h
+++ b/aos/common/controls/polytope.h
@@ -2,13 +2,8 @@
#define AOS_COMMON_CONTROLS_POLYTOPE_H_
#include "Eigen/Dense"
-#ifdef AOS_BAZEL
#include "third_party/cddlib/lib-src/setoper.h"
#include "third_party/cddlib/lib-src/cdd.h"
-#else
-#include "libcdd-094g-prefix/include/setoper.h"
-#include "libcdd-094g-prefix/include/cdd.h"
-#endif
namespace aos {
namespace controls {
diff --git a/aos/linux_code/starter/starter.cc b/aos/linux_code/starter/starter.cc
index 01a462a..a2545c2 100644
--- a/aos/linux_code/starter/starter.cc
+++ b/aos/linux_code/starter/starter.cc
@@ -27,11 +27,7 @@
#include <memory>
#include <set>
-#ifdef AOS_BAZEL
#include "third_party/libevent/event.h"
-#else
-#include <event2/event.h>
-#endif
#include "aos/common/logging/logging.h"
#include "aos/common/logging/logging_impl.h"
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 57a6ced..2917076 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -200,10 +200,6 @@
linker_flag: "-fuse-ld=gold"
- # Temporary escape hatch for the Gyp->Bazel conversion.
- # TODO(Brian): Remove this.
- compiler_flag: "-DAOS_BAZEL"
-
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
@@ -452,10 +448,6 @@
#linker_flag: "-fuse-ld=gold"
- # Temporary escape hatch for the Gyp->Bazel conversion.
- # TODO(Brian): Remove this.
- compiler_flag: "-DAOS_BAZEL"
-
# Make C++ compilation deterministic. Use linkstamping instead of these
# compiler symbols.
unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"