Merge remote-tracking branch 'origin/sm7225_r_fp4' into fp4-r-rebase
Change-Id: Ie00e47b477e1c62853a98c368c9e2933aaf66698
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ca16196..62ca5ad 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -175,6 +175,4 @@
DIRECTED_RECOVERY_SNAPSHOT := true
DIRECTED_RAMDISK_SNAPSHOT := true
-include device/qcom/qssi/vendor_snapshot_modules.mk
-include device/qcom/qssi/recovery_snapshot_modules.mk
-include device/qcom/qssi/ramdisk_snapshot_modules.mk
+-include vendor/qcom/vsdk-configs/snapshot_modules/*/*.mk
diff --git a/base.mk b/base.mk
index ca92838..d891c50 100755
--- a/base.mk
+++ b/base.mk
@@ -25,6 +25,7 @@
QCOM_BOARD_PLATFORMS += msmnile
QCOM_BOARD_PLATFORMS += sdm710
QCOM_BOARD_PLATFORMS += msmnile_au
+QCOM_BOARD_PLATFORMS += msmnile_tb
QCOM_BOARD_PLATFORMS += qcs605
QCOM_BOARD_PLATFORMS += $(MSMSTEPPE)
QCOM_BOARD_PLATFORMS += $(TRINKET)
diff --git a/ramdisk_snapshot_modules.mk b/ramdisk_snapshot_modules.mk
deleted file mode 100644
index 6c578f9..0000000
--- a/ramdisk_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RAMDISK_SNAPSHOT_MODULES :=
diff --git a/recovery_snapshot_modules.mk b/recovery_snapshot_modules.mk
deleted file mode 100644
index 18d1f01..0000000
--- a/recovery_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RECOVERY_SNAPSHOT_MODULES :=
diff --git a/system.prop b/system.prop
index 40deb17..627813b 100755
--- a/system.prop
+++ b/system.prop
@@ -131,6 +131,9 @@
#Expose aux camera for below packages
vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.mmi,com.fp.camera
+#Add snapcam in privapp list
+persist.vendor.camera.privapp.list=org.codeaurora.snapcam
+
#enable IZat OptInApp overlay
persist.vendor.overlay.izat.optin=rro
diff --git a/vendor_snapshot_modules.mk b/vendor_snapshot_modules.mk
deleted file mode 100644
index 0b08985..0000000
--- a/vendor_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VENDOR_SNAPSHOT_MODULES :=