From 785148fa9e2f833d92b0625bd8e8ca135771c54b Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sat, 11 Nov 2023 16:10:27 +0100 Subject: msm8996-common: Remove legacy verity support * This has been removed in Android 14, so there's no way to continue using this. * This commit reverts commits: 663d1fb15b06572e677f9aa7bb59136d903f6e76: msm8996-common: Move oem unlock prop set to libinit 1ec6d6b8ee8d6a3ab7a785f7b9023f0e1c1746f3: msm8996-common: Conditionally remove the OEM unlocking option f03c601509bec9331de6829531d61e927e42f736: msm8996-common: Enable OEM unlock and bootable image signing Change-Id: I5209d900487c70c7150efe76d0e7ae7cf51d1423 --- init/init_msm8996.cpp | 26 -------------------------- msm8996.mk | 5 ----- 2 files changed, 31 deletions(-) diff --git a/init/init_msm8996.cpp b/init/init_msm8996.cpp index d9b087a..650f8ed 100644 --- a/init/init_msm8996.cpp +++ b/init/init_msm8996.cpp @@ -75,35 +75,9 @@ void property_override(char const prop[], char const value[], bool add = true) } } -void import_kernel_cmdline(const std::function& fn) { - std::string cmdline; - android::base::ReadFileToString("/proc/cmdline", &cmdline); - - for (const auto& entry : android::base::Split(android::base::Trim(cmdline), " ")) { - std::vector pieces = android::base::Split(entry, "="); - if (pieces.size() == 2) { - fn(pieces[0], pieces[1]); - } - } -} - -static void init_setup_lock(const std::string& key, const std::string& value) -{ - if (key.empty()) return; - - if (key == "androidboot.lock") { - if (value.find("unlocked") != std::string::npos) { - property_override("ro.oem_unlock_supported", "0"); - } else { - property_override("ro.oem_unlock_supported", "1"); - } - } -} - void vendor_load_properties() { check_device(); - import_kernel_cmdline(init_setup_lock); property_override("dalvik.vm.heapstartsize", "8m"); property_override("dalvik.vm.heapgrowthlimit", "256m"); diff --git a/msm8996.mk b/msm8996.mk index f787598..4849f50 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -375,11 +375,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.usb@1.0-service -# Verity -PRODUCT_SYSTEM_VERITY_PARTITION=/dev/block/bootdevice/by-name/system -PRODUCT_VENDOR_VERITY_PARTITION=/dev/block/bootdevice/by-name/factory -$(call inherit-product, build/target/product/verity.mk) - # Vibrator PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-impl:64 \ -- cgit v1.2.3