diff options
author | ajmichael <ajmichael@google.com> | 2017-09-05 17:18:51 +0200 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-09-06 10:10:00 +0200 |
commit | 87f40973c52e3323abe8a2e850296026671cb6ad (patch) | |
tree | fa37e5a093fc7f57a16f36df1ad2eea8070943a7 /src/test | |
parent | 5b79925cc00396329fef9ba447cc45fc1bdf39a8 (diff) |
Make android_sdk_repository resilient to prerelease and malformed system images
Fixes https://github.com/bazelbuild/bazel/issues/3672
RELNOTES: None
PiperOrigin-RevId: 167581302
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java | 16 |
1 files changed, 16 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 9b42d6db7e..61a09e273f 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 @@ -177,6 +177,22 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { "src external/androidsdk/system-images/android-24/google_apis/x86/system.img"); } + // Regression test for https://github.com/bazelbuild/bazel/issues/3672. + @Test + public void testMalformedSystemImageDirectories() throws Exception { + scratchPlatformsDirectories(25, 26); + scratchBuildToolsDirectories("26.0.1"); + scratchSystemImagesDirectories("android-25/default/armeabi-v7a", "android-O/google_apis/x86"); + 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//:emulator_images_android_25_arm")).isNotNull(); + } + @Test public void testBuildToolsHighestVersionDetection() throws Exception { scratchPlatformsDirectories(25); |