clark: Abandon TARGET_UNIFIED_DEVICE flagHEADn7.1

* Override the unified properties using vendor init

Change-Id: I71a63cb58cdf3e7c81f3df56e343a3047d6f21b0

2 files changed, 16 insertions, 19 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1e77914..ecdc8ac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -161,7 +161,6 @@ BOARD_SEPOLICY_DIRS += \
     $(DEVICE_PATH)/sepolicy
 
 # Vendor Init
-TARGET_UNIFIED_DEVICE := true
 TARGET_INIT_VENDOR_LIB := libinit_clark
 TARGET_RECOVERY_DEVICE_MODULES := libinit_clark
 
diff --git a/init/init_clark.cpp b/init/init_clark.cpp
index 0fdc2f0..a52edf9 100644
--- a/init/init_clark.cpp
+++ b/init/init_clark.cpp
@@ -64,47 +64,45 @@ void vendor_load_properties()
     sku = property_get("ro.boot.hardware.sku");
     car = property_get("ro.boot.carrier");
 
-    property_set("ro.product.model", sku.c_str());
-
-
-    property_set("ro.build.product", "clark");
-    property_set("ro.product.device", "clark");
+    property_override("ro.product.model", sku.c_str());
+    property_override("ro.build.product", "clark");
+    property_override("ro.product.device", "clark");
 
     if (sku == "XT1572") {
-        property_set("ro.product.name", "Moto X Style");
+        property_override("ro.product.name", "Moto X Style");
         property_set("ro.telephony.default_network", "9");
         property_set("telephony.lteOnCdmaDevice", "0");
         // Region specifics
         if (car == "retin") {
             /* India */
             setMsim();
-            property_set("ro.build.description", "clark_retasia_ds-user 6.0 MPH24.49-18 18 release-keys");
-            property_set("ro.build.fingerprint", "motorola/clark_retasia_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
+            property_override("ro.build.description", "clark_retasia_ds-user 6.0 MPH24.49-18 18 release-keys");
+            property_override("ro.build.fingerprint", "motorola/clark_retasia_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
         }
         else if (car == "retbr") {
             /* Brazil */
             setMsim();
-            property_set("ro.build.description", "clark_retla_ds-user 6.0 MPH24.49-18 18 release-keys");
-            property_set("ro.build.fingerprint", "motorola/clark_retla_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
+            property_override("ro.build.description", "clark_retla_ds-user 6.0 MPH24.49-18 18 release-keys");
+            property_override("ro.build.fingerprint", "motorola/clark_retla_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
         } else {
             setSsim();
-            property_set("ro.build.description", "clark_reteu-user 6.0.1 MPHS24.107-58-1 1 release-keys");
-            property_set("ro.build.fingerprint", "motorola/clark_reteu/clark:6.0.1/MPHS24.107-58-1/1:user/release-keys");
+            property_override("ro.build.description", "clark_reteu-user 6.0.1 MPHS24.107-58-1 1 release-keys");
+            property_override("ro.build.fingerprint", "motorola/clark_reteu/clark:6.0.1/MPHS24.107-58-1/1:user/release-keys");
         }
     } else if (sku == "XT1575") {
         /* US */
         setSsim();
-        property_set("ro.product.name", "Moto X Pure Edition");
+        property_override("ro.product.name", "Moto X Pure Edition");
         property_set("ro.ril.force_eri_from_xml", "true");
         property_set("ro.telephony.get_imsi_from_sim", "true");
         property_set("ro.telephony.default_network", "10");
         property_set("telephony.lteOnCdmaDevice", "1");
-        property_set("ro.build.description", "clark_retus-user 6.0 MPHS24.49-18-4 5 release-keys");
-        property_set("ro.build.fingerprint", "motorola/clark_retus/clark:6.0/MPHS24.49-18-4/5:user/release-keys");
+        property_override("ro.build.description", "clark_retus-user 6.0 MPHS24.49-18-4 5 release-keys");
+        property_override("ro.build.fingerprint", "motorola/clark_retus/clark:6.0/MPHS24.49-18-4/5:user/release-keys");
     } else if (sku == "XT1570") {
         /* China */
         setMsim();
-        property_set("ro.product.name", "Moto X Style");
+        property_override("ro.product.name", "Moto X Style");
         property_set("ro.telephony.default_network", "22");
         property_set("telephony.lteOnCdmaDevice", "1");
         property_set("persist.radio.mcfg_enabled", "1");
@@ -116,8 +114,8 @@ void vendor_load_properties()
         property_set("ro.telephony.default_cdma_sub", "0");
         property_set("ril.subscription.types", "RUIM");
         property_set("persist.radio.force_get_pref", "1");
-        property_set("ro.build.description", "clark_retcn_ds-user 6.0 MPH24.49-18 18 release-keys");
-        property_set("ro.build.fingerprint", "motorola/clark_retcn_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
+        property_override("ro.build.description", "clark_retcn_ds-user 6.0 MPH24.49-18 18 release-keys");
+        property_override("ro.build.fingerprint", "motorola/clark_retcn_ds/clark_ds:6.0/MPH24.49-18/18:user/release-keys");
     }
 }
 static void setSsim(void)