From deffafc3ba852b31653c6cbc24541bddd4f393e8 Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Fri, 7 Jun 2019 17:52:11 -0700
Subject: [PATCH] Revert "DRAFT [morty] cv-bridge-2.1.0.inc: Migrate metadata
 from v1"

This reverts commit 0c6e3de714f89910a84b44b62a0be749ec1cad4e.
---
 includes-ros1/vision-opencv/cv-bridge-2.1.0.inc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc
index a4b4074..a73fc7f 100644
--- a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc
+++ b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc
@@ -6,7 +6,3 @@ ROS_BUILD_DEPENDS_remove = "python3-numpy"
 ROS_BUILDTOOL_DEPENDS += " \
     ${PYTHON_PN}-numpy-native \
 "
-
-# This option disables python2 support because we can't support both python2
-# and python3 since OE upstream has disabled python2 bindings in Boost.
-EXTRA_OECMAKE =+ "${@'-DANDROID=ON' if d.getVar('PYTHON_PN') != 'python3' else ''}"