Add arm cpu constraint to the mock Android platform.

PiperOrigin-RevId: 359274978
bazelbuild · Feb 24, 2021 · 31d160a · 31d160a
1 parent b243584
commit 31d160a
Showing 1 changed file with 3 additions and 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
@@ -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(",