Retrieve Android native link flag features from the right toolchain.

Previously, the feature-based flags for links of native code for Android
were coming from the standard TARGET toolchain, which is wrong. This
went unnoticed because Bazel's CROSSTOOL (and mine until recently) don't
add any flags that way in either, which means getting the flags either
way results in none.

--
Change-Id: I74cd18ff56e3aea7ca61fabe62cb2246100ee59a
Reviewed-on: https://bazel-review.googlesource.com/#/c/2322
MOS_MIGRATED_REVID=108234274

1 files changed, 2 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java b/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
index f960a8e29d..13370fd9d3 100644
--- a/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
@@ -125,7 +125,7 @@ public class GroupedListTest {
     assertFalse(groupedList.isEmpty());
     Object compressed = groupedList.compress();
     assertElementsEqual(compressed, allElts);
-    assertElementsEqualInGroups(GroupedList.create(compressed), elements);
+    assertElementsEqualInGroups(GroupedList.<String>create(compressed), elements);
     assertElementsEqualInGroups(groupedList, elements);
   }
 
@@ -157,7 +157,7 @@ public class GroupedListTest {
     assertElementsEqual(compressed, allElts);
     // Get rid of empty list -- it was not stored in groupedList.
     elements.remove(1);
-    assertElementsEqualInGroups(GroupedList.create(compressed), elements);
+    assertElementsEqualInGroups(GroupedList.<String>create(compressed), elements);
     assertElementsEqualInGroups(groupedList, elements);
   }