diff options
| -rw-r--r-- | minadbd/Android.bp | 12 | ||||
| -rw-r--r-- | minadbd/minadbd_services.cpp | 4 | ||||
| -rw-r--r-- | recovery_utils/roots.cpp | 4 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-ar/strings.xml | 4 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-hy/strings.xml | 2 | ||||
| -rw-r--r-- | updater/Android.bp | 1 | ||||
| -rw-r--r-- | updater/Android.mk | 1 |
7 files changed, 20 insertions, 8 deletions
diff --git a/minadbd/Android.bp b/minadbd/Android.bp index c39c73443..793680f33 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -34,7 +34,7 @@ cc_defaults { // `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing // the sideload service only. -cc_library { +cc_library_static { name: "libminadbd_services", recovery_available: true, @@ -79,6 +79,8 @@ cc_binary { defaults: [ "minadbd_defaults", + "libadbd_binary_dependencies", + "librecovery_utils_defaults", ], srcs: [ @@ -86,10 +88,14 @@ cc_binary { ], shared_libs: [ - "libadbd", "libbase", "libcrypto", + ], + + static_libs: [ "libminadbd_services", + "libfusesideload", + "librecovery_utils", ], required: [ @@ -104,6 +110,7 @@ cc_test { defaults: [ "minadbd_defaults", "librecovery_utils_defaults", + "libadbd_binary_dependencies", ], srcs: [ @@ -116,7 +123,6 @@ cc_test { "libfusesideload", "librecovery_utils", "libotautil", - "libadbd", ], shared_libs: [ diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index eb91fb3e4..ff91ba931 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -266,6 +266,10 @@ static void WipeDeviceService(unique_fd fd, const std::string& args) { } } +asocket* daemon_service_to_socket(std::string_view) { + return nullptr; +} + unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) { // Common services that are supported both in sideload and rescue modes. if (android::base::ConsumePrefix(&name, "reboot:")) { diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp index 58a313973..99f3c5dc9 100644 --- a/recovery_utils/roots.cpp +++ b/recovery_utils/roots.cpp @@ -157,8 +157,8 @@ int format_volume(const std::string& volume, const std::string& directory) { bool needs_projid = false; if (volume == "/data") { - needs_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false); - needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", false); + needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false); + needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false); } // If there's a key_loc that looks like a path, it should be a block device for storing encryption diff --git a/tools/recovery_l10n/res/values-ar/strings.xml b/tools/recovery_l10n/res/values-ar/strings.xml index 69191287d..a9cd2d133 100644 --- a/tools/recovery_l10n/res/values-ar/strings.xml +++ b/tools/recovery_l10n/res/values-ar/strings.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="recovery_installing" msgid="2013591905463558223">"جارٍ تثبيت إعادة تحميل النظام"</string> + <string name="recovery_installing" msgid="2013591905463558223">"جارٍ تثبيت تحديث النظام"</string> <string name="recovery_erasing" msgid="7334826894904037088">"جارٍ محو البيانات"</string> <string name="recovery_no_command" msgid="4465476568623024327">"ليس هناك أي أمر"</string> <string name="recovery_error" msgid="5748178989622716736">"خطأ!"</string> - <string name="recovery_installing_security" msgid="9184031299717114342">"جارٍ تثبيت إعادة تحميل الأمان"</string> + <string name="recovery_installing_security" msgid="9184031299717114342">"جارٍ تثبيت تحديث الأمان"</string> <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"يتعذَّر تحميل نظام Android، حيث قد تكون بياناتك تالفة. وإذا استمر ظهور هذه الرسالة، قد يتعيَّن عليك إجراء إعادة الضبط على الإعدادات الأصلية ومحو جميع بيانات المستخدم المُخزَّنة على هذا الجهاز."</string> <string name="recovery_try_again" msgid="7168248750158873496">"إعادة المحاولة"</string> <string name="recovery_factory_data_reset" msgid="7321351565602894783">"إعادة الضبط على الإعدادات الأصلية"</string> diff --git a/tools/recovery_l10n/res/values-hy/strings.xml b/tools/recovery_l10n/res/values-hy/strings.xml index 35a0ab113..76c28a707 100644 --- a/tools/recovery_l10n/res/values-hy/strings.xml +++ b/tools/recovery_l10n/res/values-hy/strings.xml @@ -9,6 +9,6 @@ <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Չհաջողվեց բեռնել Android համակարգը։ Հնարավոր է՝ ձեր տվյալները վնասված են։ Եթե նորից տեսնեք այս հաղորդագրությունը, փորձեք վերակայել սարքի կարգավորումները և ջնջել օգտատիրոջ բոլոր տվյալները։"</string> <string name="recovery_try_again" msgid="7168248750158873496">"Նորից փորձել"</string> <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Վերակայել բոլոր տվյալները"</string> - <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Մաքրե՞լ օգտատիրոջ բոլոր տվյալները։\n\n ԱՅՍ ԳՈՐԾՈՂՈՒԹՅՈՒՆԸ ՀՆԱՐԱՎՈՐ ՉԻ ԼԻՆԻ ՀԵՏԱՐԿԵԼ"</string> + <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Ջնջե՞լ օգտատիրոջ բոլոր տվյալները։\n\n ԱՅՍ ԳՈՐԾՈՂՈՒԹՅՈՒՆԸ ՀՆԱՐԱՎՈՐ ՉԻ ԼԻՆԻ ՀԵՏԱՐԿԵԼ"</string> <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Չեղարկել"</string> </resources> diff --git a/updater/Android.bp b/updater/Android.bp index cbef43099..f00a192b9 100644 --- a/updater/Android.bp +++ b/updater/Android.bp @@ -25,6 +25,7 @@ cc_defaults { "libdm", "libfec", "libfec_rs", + "libavb", "libverity_tree", "libgtest_prod", "liblog", diff --git a/updater/Android.mk b/updater/Android.mk index 8a4cd86d9..46300d974 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -32,6 +32,7 @@ updater_common_static_libraries := \ libdm \ libfec \ libfec_rs \ + libavb \ libverity_tree \ libgtest_prod \ liblog \ |