From 5393a4996d701fa192964a35cbb75e558a0599c0 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Fri, 4 Aug 2017 22:24:57 +0200 Subject: Make Bazel enforce requirement on build-tools 26.0.1 or later. Fixes #3469 Fixes #3258 RELNOTES: Bazel Android support now requires build-tools 26.0.1 or later. PiperOrigin-RevId: 164301571 --- .../android/AndroidSdkRepositoryFunction.java | 2 +- .../rules/android/AndroidSdkRepositoryTest.java | 28 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java index 0334c4478f..aa5f7619b5 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java @@ -58,7 +58,7 @@ public class AndroidSdkRepositoryFunction extends RepositoryFunction { private static final PathFragment BUILD_TOOLS_DIR = PathFragment.create("build-tools"); private static final PathFragment PLATFORMS_DIR = PathFragment.create("platforms"); private static final PathFragment SYSTEM_IMAGES_DIR = PathFragment.create("system-images"); - private static final Revision MIN_BUILD_TOOLS_REVISION = new Revision(24, 0, 3); + private static final Revision MIN_BUILD_TOOLS_REVISION = new Revision(26, 0, 1); private static final String PATH_ENV_VAR = "ANDROID_HOME"; private static final ImmutableList PATH_ENV_VAR_AS_LIST = ImmutableList.of(PATH_ENV_VAR); private static final ImmutableList LOCAL_MAVEN_REPOSITORIES = 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 1379700a6f..9b42d6db7e 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 @@ -81,7 +81,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testGeneratedAarImport() throws Exception { scratchPlatformsDirectories(25); - scratchBuildToolsDirectories("25.0.0"); + scratchBuildToolsDirectories("26.0.1"); scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "foo", "1.0.0", "aar"); FileSystemUtils.appendIsoLatin1(scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -101,7 +101,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testExportsExtrasLibraryArtifacts() throws Exception { scratchPlatformsDirectories(25); - scratchBuildToolsDirectories("25.0.0"); + scratchBuildToolsDirectories("26.0.1"); scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "foo", "1.0.0", "aar"); FileSystemUtils.appendIsoLatin1(scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -119,7 +119,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testKnownSdkMavenRepositories() throws Exception { scratchPlatformsDirectories(25); - scratchBuildToolsDirectories("25.0.0"); + scratchBuildToolsDirectories("26.0.1"); scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "a", "1.0.0", "jar"); scratchExtrasLibrary("extras/android/m2repository", "com.android.support", "b", "1.0.0", "aar"); scratchExtrasLibrary("extras/m2repository", "com.android.support", "c", "1.0.1", "aar"); @@ -148,7 +148,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testSystemImageDirectoriesAreFound() throws Exception { scratchPlatformsDirectories(25); - scratchBuildToolsDirectories("25.0.0"); + scratchBuildToolsDirectories("26.0.1"); FileSystemUtils.appendIsoLatin1(scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", "android_sdk_repository(", @@ -180,7 +180,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testBuildToolsHighestVersionDetection() throws Exception { scratchPlatformsDirectories(25); - scratchBuildToolsDirectories("24.0.3", "25.0.1"); + scratchBuildToolsDirectories("26.0.1", "26.0.2"); FileSystemUtils.appendIsoLatin1( scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -194,20 +194,20 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { ConfiguredTarget androidSdk = getConfiguredTarget("@androidsdk//:sdk"); assertThat(androidSdk).isNotNull(); assertThat(androidSdk.getProvider(AndroidSdkProvider.class).getBuildToolsVersion()) - .isEqualTo("25.0.1"); + .isEqualTo("26.0.2"); } @Test public void testApiLevelHighestVersionDetection() throws Exception { scratchPlatformsDirectories(24, 25, 23); - scratchBuildToolsDirectories("25.0.1"); + scratchBuildToolsDirectories("26.0.1"); FileSystemUtils.appendIsoLatin1( scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", "android_sdk_repository(", " name = 'androidsdk',", " path = '/sdk',", - " build_tools_version = '25.0.1',", + " build_tools_version = '26.0.1',", ")"); invalidatePackages(); @@ -221,7 +221,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { public void testMultipleAndroidSdkApiLevels() throws Exception { int[] apiLevels = {23, 24, 25}; scratchPlatformsDirectories(apiLevels); - scratchBuildToolsDirectories("25.0.1"); + scratchBuildToolsDirectories("26.0.1"); FileSystemUtils.appendIsoLatin1( scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -229,7 +229,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { " name = 'androidsdk',", " path = '/sdk',", " api_level = 24,", - " build_tools_version = '25.0.1',", + " build_tools_version = '26.0.1',", ")"); invalidatePackages(); @@ -246,7 +246,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testMissingApiLevel() throws Exception { scratchPlatformsDirectories(24); - scratchBuildToolsDirectories("25.0.1"); + scratchBuildToolsDirectories("26.0.1"); FileSystemUtils.appendIsoLatin1( scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -254,7 +254,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { " name = 'androidsdk',", " path = '/sdk',", " api_level = 25,", - " build_tools_version = '25.0.1',", + " build_tools_version = '26.0.1',", ")"); invalidatePackages(); @@ -274,7 +274,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testFilesInSystemImagesDirectories() throws Exception { scratchPlatformsDirectories(24); - scratchBuildToolsDirectories("25.0.1"); + scratchBuildToolsDirectories("26.0.1"); scratch.file("/sdk/system-images/.DS_Store"); FileSystemUtils.appendIsoLatin1(scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", @@ -289,7 +289,7 @@ public class AndroidSdkRepositoryTest extends BuildViewTestCase { @Test public void testMissingPlatformsDirectory() throws Exception { - scratchBuildToolsDirectories("25.0.0"); + scratchBuildToolsDirectories("26.0.1"); FileSystemUtils.appendIsoLatin1( scratch.resolve("WORKSPACE"), "local_repository(name = 'bazel_tools', path = '/bazel_tools_workspace')", -- cgit v1.2.3