From d9847a75baa8f1baefe472faeedf66882378a0b0 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Mon, 25 Apr 2022 08:54:30 -0700
Subject: [PATCH] Revert "Add workaround for arm vs armv7 android issue
 (#1259)"

This reverts commit f6f27a8734db21ee04bbdabe4566a0abcef11474.
---
 rust/platform/triple_mappings.bzl | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rust/platform/triple_mappings.bzl b/rust/platform/triple_mappings.bzl
index 5f5be2147f..50a94494c1 100644
--- a/rust/platform/triple_mappings.bzl
+++ b/rust/platform/triple_mappings.bzl
@@ -269,13 +269,6 @@ def triple_to_constraint_set(target_triple):
             "@rules_rust//rust/platform/os:unknown",
         ]
 
-    # Workaround for https://github.com/bazelbuild/bazel/issues/14982
-    if target_triple in ("armv7-linux-androideabi", "thumbv7neon-linux-androideabi"):
-        return [
-            "@platforms//cpu:arm",
-            "@platforms//os:android",
-        ]
-
     triple_struct = triple(target_triple)
 
     constraint_set = []