From 210e36dc1902ac5e8dbe1a020feff181abdaff75 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sun, 2 Feb 2020 18:36:51 -0800
Subject: [PATCH] Update VersionMap for Android 10

---
 dexlib2/OatVersions.txt                               |  5 +++++
 dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java  | 11 +++++++++--
 .../main/java/org/jf/dexlib2/dexbacked/OatFile.java   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dexlib2/OatVersions.txt b/dexlib2/OatVersions.txt
index a1450a52..2a505d95 100644
--- a/dexlib2/OatVersions.txt
+++ b/dexlib2/OatVersions.txt
@@ -164,3 +164,8 @@ e35ac04a1a9a22b1c4386b27f3a30cd840aa17b1 - 169
 e42a4b95eed312e6f7019645f4c66b2d77254433 - 171
 697c47a7ffd4489c4bc4edc229c8123309526286 - 172
 6c4ec5c1555aaeddd254750c15554a3c47bfc722 - 173
+02820f424714e711bbd4cb4b04a109416eb0c8b8 - 174
+f5c5eb30fc71e0c305d678bd3c1c995a5c36d508 - 175
+2191069047034ad891ea15f60a217246edc38d53 - 176
+e2a3aa988630b3c2952ac44943f03dde60454195 - 177
+a59af8aeaad8fe7d68d8f8de63eab9cf85b6ab31 - 178
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java b/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java
index e990e463..38773d33 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/VersionMap.java
@@ -63,6 +63,9 @@ public class VersionMap {
     }
 
     public static int mapArtVersionToApi(int artVersion) {
+        if (artVersion >= 170) {
+            return 29;
+        }
         if (artVersion >= 138) {
             return 28;
         }
@@ -109,9 +112,13 @@ public class VersionMap {
                 return 124;
             case 27:
                 return 131;
+            case 28:
+                return 138;
+            case 29:
+                return 170;
             default:
-                // 144 is the current version in the master branch of AOSP as of 2018-05-22
-                return 144;
+                // 178 is the current version in the master branch of AOSP as of 2020-02-02
+                return 178;
         }
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
index 5fe74288..389c46f5 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
@@ -59,7 +59,7 @@ public class OatFile extends DexBuffer implements MultiDexContainer<DexBackedDex
     // These are the "known working" versions that I have manually inspected the source for.
     // Later version may or may not work, depending on what changed.
     private static final int MIN_OAT_VERSION = 56;
-    private static final int MAX_OAT_VERSION = 173;
+    private static final int MAX_OAT_VERSION = 178;
 
     public static final int UNSUPPORTED = 0;
     public static final int SUPPORTED = 1;