am 613541b2: am 4a7ec0f3: am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '613541b2fdc2b4503f7263551c8b3f25c0565110':
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b07c668..1e6d96a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,6 +30,7 @@
TARGET_CPU_SMP := true
TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := cortex-a9
ARCH_ARM_HAVE_TLS_REGISTER := true
TARGET_NO_BOOTLOADER := true
@@ -85,3 +86,10 @@
BOARD_LIB_DUMPSTATE := libdumpstate.tuna
BOARD_USES_SECURE_SERVICES := true
+
+BOARD_SEPOLICY_DIRS := \
+ device/samsung/tuna/sepolicy
+
+BOARD_SEPOLICY_UNION := \
+ genfs_contexts \
+ file_contexts
diff --git a/device.mk b/device.mk
index 8ba2144..c4f09c4 100644
--- a/device.mk
+++ b/device.mk
@@ -96,8 +96,6 @@
# NFC
PRODUCT_PACKAGES += \
- libnfc \
- libnfc_jni \
Nfc \
Tag
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
new file mode 100644
index 0000000..1602cce
--- /dev/null
+++ b/sepolicy/file_contexts
@@ -0,0 +1,30 @@
+#rild
+/data/radio/nv_data.bin.* u:object_r:radio_data_file:s0
+/dev/block/mmcblk0p4 u:object_r:radio_device:s0
+/dev/block/mmcblk0p9 u:object_r:radio_device:s0
+/dev/block/platform/omap/omap_hsmmc.0/by-name/radio u:object_r:radio_device:s0
+/dev/cdma_.* u:object_r:radio_device:s0
+/dev/dsscomp u:object_r:video_device:s0
+/dev/lte_.* u:object_r:radio_device:s0
+/dev/tiler u:object_r:video_device:s0
+/dev/ttyFIQ0 u:object_r:console_device:s0
+/dev/ttyGS0 u:object_r:radio_device:s0
+/dev/ttyGS1 u:object_r:radio_device:s0
+/dev/umts_boot0 u:object_r:radio_device:s0
+/dev/umts_boot1 u:object_r:radio_device:s0
+/dev/umts_ipc0 u:object_r:radio_device:s0
+/dev/umts_ramdump0 u:object_r:radio_device:s0
+/dev/umts_rfs0 u:object_r:radio_device:s0
+/factory(/.*)? u:object_r:efs_file:s0
+/factory/bluetooth(/.*)? u:object_r:bluetooth_efs_file:s0
+/factory/nv_data.bin.* u:object_r:radio_data_file:s0
+
+#nfc
+/dev/ttyO3 u:object_r:nfc_device:s0
+
+#The devices and files used by the hciattach service are device specific
+/system/bin/brcm_patchram_plus u:object_r:hci_attach_exec:s0
+/dev/ttyO1 u:object_r:hci_attach_dev:s0
+
+# In Samsung Tuna Board, ttyO0 is for uart driver. gps_device is device specific
+/dev/ttyO0 u:object_r:gps_device:s0
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
new file mode 100644
index 0000000..56ef603
--- /dev/null
+++ b/sepolicy/genfs_contexts
@@ -0,0 +1,2 @@
+# This proc entry is for CSR GPS chip on Samsung Tuna Board.
+genfscon proc /mcspi1_cs3_ctrl u:object_r:gps_control:s0
