diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-30 23:39:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-30 23:39:30 -0700 |
| commit | 5c453c09fa67a4eba499f5f9144fbb98ff8523f4 (patch) | |
| tree | 4f25532edb62fe20e2e08a87ff0e8f70dec87690 | |
| parent | 60c89cf338a19591ea8b6c9627cf32fdf5300b98 (diff) | |
| parent | b4d9c7399b6c965b458cf1d72c85fc550877fdb8 (diff) | |
Merge "falcon_64: Enable HW FDE"
| -rwxr-xr-x | BoardConfig.mk | 9 | ||||
| -rwxr-xr-x | init.target.rc | 2 | ||||
| -rw-r--r-- | sdm660_64.mk | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 3cba75f..9d97550 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -19,13 +19,6 @@ TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := cortex-a53 -ifeq ($(TARGET_USES_AOSP), true) - TARGET_HW_DISK_ENCRYPTION := false -else - #Enable HW based full disk encryption - TARGET_HW_DISK_ENCRYPTION := true -endif - TARGET_NO_BOOTLOADER := false TARGET_USES_UEFI := true TARGET_NO_KERNEL := false @@ -130,7 +123,7 @@ TARGET_COMPILE_WITH_MSM_KERNEL := true TARGET_PD_SERVICE_ENABLED := true #Enable HW based full disk encryption -#TARGET_HW_DISK_ENCRYPTION := true +TARGET_HW_DISK_ENCRYPTION := true TARGET_CRYPTFS_HW_PATH := device/qcom/common/cryptfs_hw diff --git a/init.target.rc b/init.target.rc index b56ee70..ae801d0 100755 --- a/init.target.rc +++ b/init.target.rc @@ -56,7 +56,7 @@ on fs on post-fs start qseecomd - exec - root root root -- /system/bin/init.qti.qseecomd.sh + exec - system system -- /vendor/bin/init.qti.qseecomd.sh write /dev/ipa 1 on init diff --git a/sdm660_64.mk b/sdm660_64.mk index 7998b1a..3adfe5d 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -188,7 +188,7 @@ PRODUCT_COPY_FILES += \ # FBE support PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh + device/qcom/sdm660_64/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh # MSM IRQ Balancer configuration file PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf |