| author | Eric Zhong <eric.zhong@amlogic.com> | 2017-11-01 03:03:34 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-11-01 03:03:34 (GMT) |
| commit | 62f09488d2008db397eb906965182d6cc9b9651a (patch) | |
| tree | 902f992eb3ab5b454a1da52d328d7a32d1f48536 | |
| parent | 2a2cc60f858597daf82a75aeb345c22b95f13682 (diff) | |
| parent | 43e08daa3b1bcf3354e152be10e7ada649770ac8 (diff) | |
| download | tdk-62f09488d2008db397eb906965182d6cc9b9651a.zip tdk-62f09488d2008db397eb906965182d6cc9b9651a.tar.gz tdk-62f09488d2008db397eb906965182d6cc9b9651a.tar.bz2 | |
Merge "treble: enable full treble mode [1/1]" into tdk-v2.4
| -rw-r--r-- | ca_export_arm/Android.mk | 15 | ||||
| -rw-r--r-- | ca_export_arm/bin_android/tee-supplicant.rc | 16 |
2 files changed, 31 insertions, 0 deletions
diff --git a/ca_export_arm/Android.mk b/ca_export_arm/Android.mk index c60310e..0609239 100644 --- a/ca_export_arm/Android.mk +++ b/ca_export_arm/Android.mk @@ -8,6 +8,13 @@ LOCAL_SRC_FILES := ../ca_export_arm64/bin_android/tee-supplicant endif LOCAL_MODULE := tee-supplicant LOCAL_MODULE_CLASS := EXECUTABLES + +LOCAL_INIT_RC := bin_android/tee-supplicant.rc + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_PREBUILT) @@ -18,6 +25,10 @@ LOCAL_MODULE := libteec LOCAL_MULTILIB := both LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_PREBUILT) @@ -27,5 +38,9 @@ LOCAL_SRC_FILES := scripts/tdk_auto_test.sh LOCAL_MODULE := tdk_auto_test LOCAL_MODULE_SUFFIX := .sh LOCAL_MODULE_CLASS := EXECUTABLES + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_PREBUILT) endif diff --git a/ca_export_arm/bin_android/tee-supplicant.rc b/ca_export_arm/bin_android/tee-supplicant.rc new file mode 100644 index 0000000..52d4e16 --- a/dev/null +++ b/ca_export_arm/bin_android/tee-supplicant.rc @@ -0,0 +1,16 @@ +on early-init + insmod /boot/optee.ko + insmod /boot/optee_armtz.ko + +on post-fs + restorecon_recursive /tee + start tee_supplicant + +on property:vold.post_fs_data_done=1 + start tee_supplicant + +service tee_supplicant /vendor/bin/tee-supplicant + oneshot + user root + group system + seclabel u:r:tee:s0 |