From 31d160a0b59bd5a6e524a529073e7e403d29bb27 Mon Sep 17 00:00:00 2001
From: jcater <jcater@google.com>
Date: Wed, 24 Feb 2021 06:56:22 -0800
Subject: [PATCH] Add arm cpu constraint to the mock Android platform.

PiperOrigin-RevId: 359274978
---
 .../devtools/build/lib/analysis/mock/BazelAnalysisMock.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 4f89e6b8975471..c6585ea8a1f340 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -210,7 +210,8 @@ public void setupMockClient(MockToolsConfig config, List<String> workspaceConten
         "  name = 'android',",
         "  parents = ['" + TestConstants.PLATFORM_PACKAGE_ROOT + ":default_target'],",
         "  constraint_values = [",
-        "    '" + TestConstants.PLATFORM_PACKAGE_ROOT + ":android',",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:android',",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:arm',",
         "  ],",
         ")");
 
@@ -389,7 +390,7 @@ private ImmutableList<String> createAndroidBuildContents() {
         "  toolchain = ':sdk',",
         "  toolchain_type = ':sdk_toolchain_type',",
         "  target_compatible_with = [",
-        "    '@bazel_tools//platforms:android',",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:android',",
         "  ],",
         ")",
         "android_sdk(",