diff options
| author |  Googler <noreply@google.com> | 2017-04-15 02:04:07 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-04-18 11:28:34 +0200 |
| commit | 6fc43c0549efc109301630f69f59488ee0793f90 (patch) | |
| tree | 721fcfc71cc857ad9cc390f42c51a1212babec24 /src/test/java/com | |
| parent | c52d73e9a76989e483d2998250a132e8d5e10098 (diff) | |
Expose the native libs of the android_binary rule to skylark.
RELNOTES: none
PiperOrigin-RevId: 153223511
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java index 392c9e6453..63d0589c93 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java @@ -24,6 +24,8 @@ import com.google.devtools.build.lib.actions.util.LabelArtifactOwner; import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; +import com.google.devtools.build.lib.collect.nestedset.NestedSet; +import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.util.FileSystems; @@ -87,11 +89,16 @@ public class ApkManifestActionTest { null, // mainDexProguardConfig false /* legacy */); - NativeLibs nativeLibs = new NativeLibs( - ImmutableMap.<String, Iterable<Artifact>>of( - "x86", ImmutableList.of(createArtifact("/workspace/java/test/x86.so")), - "arm", ImmutableList.of(createArtifact("/workspace/java/test/arm.so"))), - null /* nativeLibsName */); + NativeLibs nativeLibs = + new NativeLibs( + ImmutableMap.<String, NestedSet<Artifact>>of( + "x86", NestedSetBuilder.<Artifact>stableOrder() + .add(createArtifact("/workspace/java/test/x86.so")) + .build(), + "arm", NestedSetBuilder.<Artifact>stableOrder() + .add(createArtifact("/workspace/java/test/arm.so")) + .build()), + null /* nativeLibsName */); Artifact debugKeystore = createArtifact("/workspace/tools/android/debug_keystore"); |