From 147abe7abf0b30fee129993eb84e1a175b77cdb4 Mon Sep 17 00:00:00 2001 From: Adam Michael Date: Thu, 5 Jan 2017 22:38:36 +0000 Subject: These API levels were removed in NDK r12. TESTED= $ ls android-ndk-r12b/platforms android-12 android-15 android-18 android-22 android-9 android-13 android-16 android-19 android-23 android-14 android-17 android-21 android-24 RELNOTES: Removed broken api levels 3, 4 and 5 from Android NDK 12. -- PiperOrigin-RevId: 143710544 MOS_MIGRATED_REVID=143710544 --- .../lib/bazel/rules/android/ndkcrosstools/r12/ApiLevelR12.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/ApiLevelR12.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/ApiLevelR12.java index b5fc0a6b43..c4816f5c7a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/ApiLevelR12.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/ApiLevelR12.java @@ -24,9 +24,6 @@ public class ApiLevelR12 extends ApiLevel { private static final ImmutableListMultimap API_LEVEL_TO_ARCHITECTURES = ImmutableListMultimap.builder() - .putAll("3", "arm") - .putAll("4", "arm") - .putAll("5", "arm") .putAll("8", "arm") .putAll("9", "arm", "mips", "x86") .putAll("12", "arm", "mips", "x86") @@ -59,11 +56,7 @@ public class ApiLevelR12 extends ApiLevel { */ private static final ImmutableMap API_EQUIVALENCIES = ImmutableMap.builder() - .put("3", "3") - .put("4", "4") - // Case 1 - .put("5", "5") .put("6", "5") .put("7", "5") .put("8", "8") -- cgit v1.2.3