From 420c7ba072abddc4183712b9f378ad9d351b328e Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Sat, 28 Oct 2017 23:50:21 -0700
Subject: [PATCH] m7univ: Remove TARGET_UNIFIED_DEVICE usage

* Use property_override() to set normally ro properties.
---
 BoardConfig.mk                |  1 -
 recovery/init/init_m7univ.cpp | 25 +++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 851d30a..fc22fba 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,7 +87,6 @@ BOARD_CHARGING_MODE_BOOTING_LPM := /sys/htc_lpm/lpm_mode
 BOARD_SEPOLICY_DIRS += device/htc/m7univ/sepolicy
 
 # Vendor Init
-TARGET_UNIFIED_DEVICE := true
 TARGET_INIT_VENDOR_LIB := libinit_m7univ
 
 # TWRP
diff --git a/recovery/init/init_m7univ.cpp b/recovery/init/init_m7univ.cpp
index 0969d59..5d85db0 100644
--- a/recovery/init/init_m7univ.cpp
+++ b/recovery/init/init_m7univ.cpp
@@ -28,11 +28,24 @@
  */
 
 #include <stdlib.h>
+#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
+#include <sys/_system_properties.h>
+
 #include <string>
 
 #include "property_service.h"
 #include "vendor_init.h"
 
+void property_override(char const prop[], char const value[]) {
+    prop_info *pi;
+
+    pi = (prop_info*) __system_property_find(prop);
+    if (pi)
+        __system_property_update(pi, value, strlen(value));
+    else
+        __system_property_add(prop, strlen(prop), value, strlen(value));
+}
+
 void vendor_load_properties() {
     std::string platform = property_get("ro.board.platform");
     if (platform != ANDROID_TARGET)
@@ -40,13 +53,13 @@ void vendor_load_properties() {
 
     std::string bootmid = property_get("ro.boot.mid");
     if (bootmid.find("PN0720000") != std::string::npos) {
-        property_set("ro.product.device", "m7wls");
-        property_set("ro.build.product", "m7wls");
+        property_override("ro.product.device", "m7wls");
+        property_override("ro.build.product", "m7wls");
     } else if (bootmid.find("PN0731000") != std::string::npos) {
-        property_set("ro.product.device", "m7wlv");
-        property_set("ro.build.product", "m7wlv");
+        property_override("ro.product.device", "m7wlv");
+        property_override("ro.build.product", "m7wlv");
     } else {
-        property_set("ro.product.device", "m7");
-        property_set("ro.build.product", "m7");
+        property_override("ro.product.device", "m7");
+        property_override("ro.build.product", "m7");
     }
 }