aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init/init_msm8996.cpp26
-rwxr-xr-xmsm8996.mk5
2 files changed, 0 insertions, 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<void(const std::string&, const std::string&)>& fn) {
- std::string cmdline;
- android::base::ReadFileToString("/proc/cmdline", &cmdline);
-
- for (const auto& entry : android::base::Split(android::base::Trim(cmdline), " ")) {
- std::vector<std::string> 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 \