From 5ea74e11717815e38116636366878977ae96f885 Mon Sep 17 00:00:00 2001
From: Nikolay Lezhnev <nikolay.lezhnev@gmail.com>
Date: Thu, 14 Nov 2019 11:24:23 +0300
Subject: [PATCH] androidx support

---
 .../android/AndroidSupportLibraryResolver.cs  | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs b/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs
index ef0d7a1bb..9bc735b62 100644
--- a/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs
+++ b/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs
@@ -74,33 +74,15 @@ private static void setupDependencies()
                     "ProjectSettings"
                 });
 
-            // com.android.support:support-v4
-            Google.VersionHandler.InvokeInstanceMethod(
-                svcSupport,
-                "DependOn",
-                new object[] {
-                    "com.android.support",
-                    "support-v4",
-                       "25.3.1"
-                },
-                namedArgs: new Dictionary<string, object>() {
-                    {
-                        "packageIds",
-                        new string[] {
-                            "extra-android-m2repository"
-                        }
-                    }
-                });
-
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "support-v4", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "appcompat-v7", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "cardview-v7", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "customtabs", "25.3.1");
-
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.legacy", "legacy-support-v4", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.appcompat", "appcompat", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.cardview", "cardview", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.browser", "browser", "1.0.0");
         }
 
         public static void addSupportLibraryDependency(
             object svcSupport,
+            string packagePrefix,
             String packageName,
             String version)
         {
@@ -108,7 +90,7 @@ public static void addSupportLibraryDependency(
                 svcSupport,
                 "DependOn",
                 new object[] {
-                    "com.android.support",
+                    packagePrefix,
                     packageName,
                        version
                 },