summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-09 01:52:45 +0200
committerXin Li <delphij@google.com>2020-09-09 01:52:45 +0200
commit7d57e8e43e24b0bd5a3efeb6f085c096df035b66 (patch)
tree456ba84f1d43e6e76c2806880a318d0de31b869b
parentMerge "Import translations. DO NOT MERGE ANYWHERE" (diff)
parent[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1afe09da2 -s ours (diff)
downloadandroid_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar.gz
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar.bz2
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar.lz
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar.xz
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.tar.zst
android_bootable_recovery-7d57e8e43e24b0bd5a3efeb6f085c096df035b66.zip
-rw-r--r--Android.bp1
-rw-r--r--recovery.cpp6
-rw-r--r--tools/image_generator/ImageGenerator.java2
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");