Remove Java language constraints

These are no longer going to be used for Java language versions configuration, see: https://docs.google.com/document/d/13yXhOQeMZQmlW3obyZ7fJP3sm3eVLbK3Nuk2LZjcZiU/edit#heading=h.5mcn15i0e1ch PiperOrigin-RevId: 364390842
katre · Mar 22, 2021 · 56026b8 · 56026b8
1 parent 9a5a1c6
commit 56026b8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
@@ -116,7 +116,6 @@ public static void setup(
         "        '" + constraintsPackageRoot + "cpu:x86_64',",
         "        '" + constraintsPackageRoot + "os:linux',",
         "        '" + platformPackageRoot + "/java/constraints:jdk11',",
-        "        '" + platformPackageRoot + "/java/constraints:java8',",
         "    ],",
         ")",
         "platform(",
@@ -125,7 +124,6 @@ public static void setup(
         "        '" + constraintsPackageRoot + "cpu:x86_64',",
         "        '" + constraintsPackageRoot + "os:linux',",
         "        '" + platformPackageRoot + "/java/constraints:jdk11',",
-        "        '" + platformPackageRoot + "/java/constraints:java8',",
         "    ],",
         ")");
     mockToolsConfig.create(

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidPlatformsTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidPlatformsTest.java
@@ -60,13 +60,11 @@ public void setupPlatformsAndToolchains() throws Exception {
         "platform(",
         "    name = 'x86_platform',",
         "    constraint_values = [",
-        "        '" + TestConstants.PLATFORM_PACKAGE_ROOT + "/java/constraints:java8',",
         "        '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64',",
         "    ])",
         "platform(",
         "    name = 'arm_platform',",
         "    constraint_values = [",
-        "        '" + TestConstants.PLATFORM_PACKAGE_ROOT + "/java/constraints:java8',",
         "        '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:arm',",
         "    ])");
     BazelMockAndroidSupport.setupPlatformResolvableSdks(mockToolsConfig);