diff options
author | Xin Li <delphij@google.com> | 2020-09-10 19:22:18 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-10 19:22:18 +0200 |
commit | 2172474d50c7ce7cc54cedb8499a0f4d939bd8a2 (patch) | |
tree | 456ba84f1d43e6e76c2806880a318d0de31b869b | |
parent | Merge "Import translations. DO NOT MERGE ANYWHERE" (diff) | |
parent | Merge Android R (diff) | |
download | android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar.gz android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar.bz2 android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar.lz android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar.xz android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.tar.zst android_bootable_recovery-2172474d50c7ce7cc54cedb8499a0f4d939bd8a2.zip |
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | recovery.cpp | 6 | ||||
-rw-r--r-- | tools/image_generator/ImageGenerator.java | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index c0c58ddbc..bd2d0b0b2 100644 --- a/Android.bp +++ b/Android.bp @@ -96,7 +96,6 @@ cc_library_static { ], shared_libs: [ - "libfusesideload", "librecovery_ui", ], } diff --git a/recovery.cpp b/recovery.cpp index 09738eb85..36924fbdf 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -746,12 +746,6 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 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"; diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index fd8e54295..1da43e5c6 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -123,7 +123,7 @@ public class ImageGenerator { 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"); |