From a53cd8cdc839e2608e7f4b0682c32f620fcd6be9 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 16 Jun 2017 14:35:54 +0100
Subject: [PATCH] potter: Abandon TARGET_UNIFIED_DEVICE flag

 * Override the unified properties using vendor init

Change-Id: Ia9f780793e06ed37ac26d6de395c73ee6e37f6c1
---
 BoardConfig.mk       | 21 +++++++++++----------
 init/init_potter.cpp |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0076b66..c92e703 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+#               2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -158,13 +158,14 @@ BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy
 USE_SENSOR_MULTI_HAL := true
 
 # Wifi
-BOARD_HAS_QCOM_WLAN := true
-BOARD_HAS_QCOM_WLAN_SDK := true
-BOARD_WLAN_DEVICE := qcwcn
-BOARD_HOSTAPD_DRIVER := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_qcwcn
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+BOARD_HAS_QCOM_WLAN              := true
+BOARD_HAS_QCOM_WLAN_SDK          := true
+BOARD_WLAN_DEVICE                := qcwcn
+BOARD_HOSTAPD_DRIVER             := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_qcwcn
+BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_qcwcn
-WIFI_DRIVER_FW_PATH_AP := "ap"
-WIFI_DRIVER_FW_PATH_STA := "sta"
-WPA_SUPPLICANT_VERSION := VER_0_8_X
+WIFI_DRIVER_FW_PATH_AP           := "ap"
+WIFI_DRIVER_FW_PATH_STA          := "sta"
+WPA_SUPPLICANT_VERSION           := VER_0_8_X
+
diff --git a/init/init_potter.cpp b/init/init_potter.cpp
index 615cd13..0eaba3a 100644
--- a/init/init_potter.cpp
+++ b/init/init_potter.cpp
@@ -68,7 +68,7 @@ void vendor_load_properties()
         return;
 
     std::string sku = property_get("ro.boot.hardware.sku");
-    property_set("ro.product.model", sku.c_str());
+    property_override("ro.product.model", sku.c_str());
 
     // rmt_storage
     std::string device = property_get("ro.boot.device");