diff options
| author | lambdadroid <lambdadroid@gmail.com> | 2018-09-26 22:56:51 +0200 |
|---|---|---|
| committer | lambdadroid <lambdadroid@gmail.com> | 2018-09-26 22:56:51 +0200 |
| commit | c4faea8c5b4f32924a6b3e17567830a64e153a91 (patch) | |
| tree | 732de28de4793959182171468729903d0060c102 | |
| parent | Fix header file for property_get (diff) | |
| download | android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar.gz android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar.bz2 android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar.lz android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar.xz android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.tar.zst android_bootable_recovery-c4faea8c5b4f32924a6b3e17567830a64e153a91.zip | |
| -rw-r--r-- | twinstall.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/twinstall.cpp b/twinstall.cpp index a2f54c941..f451ca551 100644 --- a/twinstall.cpp +++ b/twinstall.cpp @@ -67,10 +67,12 @@ extern "C" { #define AB_OTA "payload_properties.txt" +#ifndef TW_NO_LEGACY_PROPS static const char* properties_path = "/dev/__properties__"; static const char* properties_path_renamed = "/dev/__properties_kk__"; static bool legacy_props_env_initd = false; static bool legacy_props_path_modified = false; +#endif enum zip_type { UNKNOWN_ZIP_TYPE = 0, @@ -79,6 +81,7 @@ enum zip_type { TWRP_THEME_ZIP_TYPE }; +#ifndef TW_NO_LEGACY_PROPS // to support pre-KitKat update-binaries that expect properties in the legacy format static int switch_to_legacy_properties() { @@ -120,6 +123,7 @@ static int switch_to_new_properties() return 0; } +#endif static int Install_Theme(const char* path, ZipWrap *Zip) { #ifdef TW_OEM_BUILD // We don't do custom themes in OEM builds @@ -173,6 +177,7 @@ static int Prepare_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache return INSTALL_SUCCESS; } +#ifndef TW_NO_LEGACY_PROPS static bool update_binary_has_legacy_properties(const char *binary) { const char str_to_match[] = "ANDROID_PROPERTY_WORKSPACE"; int len_to_match = sizeof(str_to_match) - 1; @@ -205,6 +210,7 @@ static bool update_binary_has_legacy_properties(const char *binary) { return found; } +#endif static int Run_Update_Binary(const char *path, ZipWrap *Zip, int* wipe_cache, zip_type ztype) { int ret_val, pipe_fd[2], status, zip_verify; |