aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Satayev <satayev@google.com>2022-05-06 15:15:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-06 15:15:38 +0000
commit41e6dd090f1e6a6d59690e594ce04d77d1c4d9ff (patch)
tree002ee7903afcd53fa53b028956f737ce538ec11d
parentd0ca5b572eca460601f70df6d50880064c8d4e98 (diff)
parent2ea954fdf751b7251e104f3d3f3e7a3a2ef2e675 (diff)
downloadplatform-compat-41e6dd090f1e6a6d59690e594ce04d77d1c4d9ff.tar.gz
Add support for max-target-s am: 2ea954fdf7
Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/18164346 Change-Id: Icfd8af4ea64dab6063ebf7805c8eeccb98ae867f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--java/com/android/class2nonsdklist/Class2NonSdkList.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/com/android/class2nonsdklist/Class2NonSdkList.java b/java/com/android/class2nonsdklist/Class2NonSdkList.java
index 1ee6007..e5ef5f4 100644
--- a/java/com/android/class2nonsdklist/Class2NonSdkList.java
+++ b/java/com/android/class2nonsdklist/Class2NonSdkList.java
@@ -60,6 +60,7 @@ public class Class2NonSdkList {
private static final String FLAG_MAX_TARGET_P = "max-target-p";
private static final String FLAG_MAX_TARGET_Q = "max-target-q";
private static final String FLAG_MAX_TARGET_R = "max-target-r";
+ private static final String FLAG_MAX_TARGET_S = "max-target-s";
private static final String FLAG_PUBLIC_API = "public-api";
@@ -72,8 +73,8 @@ public class Class2NonSdkList {
map.put(28, FLAG_MAX_TARGET_P);
map.put(29, FLAG_MAX_TARGET_Q);
map.put(30, FLAG_MAX_TARGET_R);
- map.put(31, FLAG_UNSUPPORTED); // TODO(b/169748350) add support for FLAG_MAX_TARGET_S
- map.put(32, FLAG_UNSUPPORTED); // same for S_V2 and T
+ map.put(31, FLAG_MAX_TARGET_S);
+ map.put(32, FLAG_UNSUPPORTED);
map.put(33, FLAG_UNSUPPORTED);
map.put(10000, FLAG_UNSUPPORTED); // VMRuntime.SDK_VERSION_CUR_DEVELOPMENT
TARGET_SDK_TO_LIST_MAP = Collections.unmodifiableMap(map);