g12: Drop duplicated property

* In g12.mk already.

Change-Id: I680d28252b671dd349382c7b4f38f82926e3d7d0

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e80d8a82c81bc08a1b0223a32d1a6c0001248791..6b4fa996fa7ae51d2fbed0de49f64f198bd0a2b9 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -47,7 +47,7 @@ DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
 BOARD_BOOTIMG_HEADER_VERSION := 2
 BOARD_DTB_OFFSET := 0x00e88000
 BOARD_KERNEL_BASE := 0x01078000
-BOARD_KERNEL_CMDLINE := androidboot.dynamic_partitions=true androidboot.dtbo_idx=0 androidboot.boot_devices=ffe07000.emmc otg_device=1 use_uvm=1
+BOARD_KERNEL_CMDLINE := androidboot.dynamic_partitions=true androidboot.dtbo_idx=0 androidboot.boot_devices=ffe07000.emmc otg_device=1 use_uvm=1 androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := Image.gz
 BOARD_KERNEL_OFFSET := 0x00008000
 BOARD_KERNEL_PAGESIZE := 2048

diff --git a/product.prop b/product.prop
index 59e6135a0c3f9e6d89d76ea6ea5aa91c829f9069..bae61500fc031bea6375eea3ae3fae6306c5f6a5 100644 (file)
--- a/product.prop
+++ b/product.prop
@@ -14,7 +14,6 @@ ro.boot.fake_battery=42
 
 ## Bluetooth
 atv.setup.bt_remote_pairing=true
-config.disable_bluetooth=false
 ro.boot.btmacaddr=22:22:ce:d2:ca:13
 
 ## Camera