diff options
| author |  Adam Michael <ajmichael@google.com> | 2017-02-17 20:47:25 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-02-20 09:42:35 +0000 |
| commit | 1a54aa699c60b131e90598dae9d5226ee9da9399 (patch) | |
| tree | df0ef2209228c41e887fa6d4ba888907004a26f0 /src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java | |
| parent | b8a6c332bd79372d558c16ac0f9206279b889d48 (diff) | |
Make android_ndk_repository api_level attribute optional.
If not specified, the highest api level in the NDK is used.
This is one more step towards the goal of making android_{s,n}dk_repository better for our users in https://github.com/bazelbuild/bazel/issues/2284.
RELNOTES: android_ndk_repository api_level attribute is now optional. If not
specified, the highest api level in the ndk/platforms directory is used.
--
PiperOrigin-RevId: 147868288
MOS_MIGRATED_REVID=147868288
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java index 3d4709778a..57a6ac45db 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java @@ -19,6 +19,8 @@ import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.config.ConfigurationFactory; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; +import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction; +import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule; import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction; import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule; import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer; @@ -123,7 +125,8 @@ public abstract class AnalysisMock extends LoadingMock { RepositoryFunction localRepositoryFunction = new LocalRepositoryFunction(); ImmutableMap<String, RepositoryFunction> repositoryHandlers = ImmutableMap.of( LocalRepositoryRule.NAME, localRepositoryFunction, - AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction()); + AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction(), + AndroidNdkRepositoryRule.NAME, new AndroidNdkRepositoryFunction()); return ImmutableMap.of( SkyFunctions.REPOSITORY_DIRECTORY, |