Make Bazel resilient to files in /sdk/system-images.

Fixes https://github.com/bazelbuild/bazel/issues/2739.

RELNOTES: None

PiperOrigin-RevId: 151592983

1 files changed, 17 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
index a6aa5b907e..fd64a4a8ca 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
@@ -238,4 +238,21 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase {
                   + "or install api level 25 from the Android SDK Manager.");
     }
   }
+
+  // Regression test for https://github.com/bazelbuild/bazel/issues/2739.
+  @Test
+  public void testFilesInSystemImagesDirectories() throws Exception {
+    scratchPlatformsDirectories(24);
+    scratchBuildToolsDirectories("25.0.1");
+    scratch.file("/sdk/system-images/.DS_Store");
+    FileSystemUtils.appendIsoLatin1(scratch.resolve("WORKSPACE"),
+        "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')",
+        "android_sdk_repository(",
+        "    name = 'androidsdk',",
+        "    path = '/sdk',",
+        ")");
+    invalidatePackages();
+
+    assertThat(getConfiguredTarget("@androidsdk//:sdk")).isNotNull();
+  }
 }