commit 2172474d50c7ce7cc54cedb8499a0f4d939bd8a2
author Xin Li <delphij@google.com> Thu Sep 10 17:22:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 10 17:22:18 2020 +0000
tree 456ba84f1d43e6e76c2806880a318d0de31b869b
parent b1afe09da23a4fd1778bf7cbd3763a4e6071b92b
parent 7d57e8e43e24b0bd5a3efeb6f085c096df035b66

Merge "Merge Android R"

Android.bp

diff --git a/Android.bp b/Android.bp
index c0c58dd..bd2d0b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,7 +96,6 @@
     ],
 
     shared_libs: [
-        "libfusesideload",
         "librecovery_ui",
     ],
 }

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 09738eb..36924fb 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -746,12 +746,6 @@
         set_retry_bootloader_message(retry_count + 1, args);
       }
 
-      if (update_package[0] == '@') {
-        ensure_path_mounted(update_package + 1);
-      } else {
-        ensure_path_mounted(update_package);
-      }
-
       bool should_use_fuse = false;
       if (!SetupPackageMount(update_package, &should_use_fuse)) {
         LOG(INFO) << "Failed to set up the package access, skipping installation";

tools/image_generator/ImageGenerator.java

diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java
index fd8e542..1da43e5 100644
--- a/tools/image_generator/ImageGenerator.java
+++ b/tools/image_generator/ImageGenerator.java
@@ -123,7 +123,7 @@
                     put("hy", "NotoSansArmenian-Regular");
                     put("iw", "NotoSansHebrew-Regular");
                     put("ja", "NotoSansCJK-Regular");
-                    put("ka", "NotoSansGeorgian-Regular");
+                    put("ka", "NotoSansGeorgian-VF");
                     put("ko", "NotoSansCJK-Regular");
                     put("km", "NotoSansKhmerUI-Regular");
                     put("kn", "NotoSansKannadaUI-Regular");