From 0488ab51809a1203a0bab41692743b4c7adb917d Mon Sep 17 00:00:00 2001
From: Roberto Gibellini <gibellini.roberto@gmail.com>
Date: Sat, 19 Nov 2016 17:22:19 -0700
Subject: Revert "i9305 : first cleanup"

I'll push single commits

This reverts commit 59404fd3487ba4b00a342434ce11a694c41bc954.

Change-Id: I935bb25cf6f47bcb768522bc4ad846dabd720e65
---
 BoardConfig.mk | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'BoardConfig.mk')

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 660414c..fe15653 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
--include device/samsung/smdk4412-qcom-common/BoardCommonConfig.mk
+# This variable is set first, so it can be overridden
+# by BoardConfigVendor.mk
+
 -include device/samsung/smdk4412-common/BoardCommonConfig.mk
+-include device/samsung/smdk4412-qcom-common/BoardCommonConfig.mk
 
 LOCAL_PATH := device/samsung/i9305
 
@@ -23,8 +26,7 @@ LOCAL_PATH := device/samsung/i9305
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
 
 # RIL
-BOARD_PROVIDES_LIBRIL := true
-BOARD_MODEM_TYPE := mdm9x35
+COMMON_GLOBAL_CFLAGS += -DPROPERTY_PERMS_APPEND='{ "ril.ks.status", AID_SYSTEM, 0 },'
 
 # Camera
 COMMON_GLOBAL_CFLAGS += -DCAMERA_WITH_CITYID_PARAM
@@ -40,6 +42,27 @@ RECOVERY_FSTAB_VERSION := 2
 # assert
 TARGET_OTA_ASSERT_DEVICE := m3,m3xx,i9305,GT-I9305
 
+# inherit from the proprietary version
+-include vendor/samsung/i9305/BoardConfigVendor.mk
+
 # Selinux
 BOARD_SEPOLICY_DIRS += \
     device/samsung/i9305/selinux
+
+BOARD_SEPOLICY_UNION += \
+    file_contexts \
+    te_macros \
+    device.te \
+    dhcp.te \
+    domain.te \
+    file.te \
+    init.te \
+    kickstart.te \
+    mediaserver.te \
+    netmgrd.te \
+    qmux.te \
+    rild.te \
+    secril.te \
+    system.te \
+    ueventd.te \
+    wpa_supplicant.te
-- 
cgit v1.1