diff --git a/secure_element/aidl/default/Android.bp b/secure_element/aidl/default/Android.bp index d1bb393931..b38282234d 100644 --- a/secure_element/aidl/default/Android.bp +++ b/secure_element/aidl/default/Android.bp @@ -11,14 +11,50 @@ cc_binary { name: "android.hardware.secure_element-service.example", relative_install_path: "hw", vendor: true, - init_rc: ["secure_element.rc"], - vintf_fragments: ["secure_element.xml"], + installable: false, // installed in APEX + + stl: "c++_static", shared_libs: [ - "libbase", "libbinder_ndk", + "liblog", + ], + static_libs: [ "android.hardware.secure_element-V1-ndk", + "libbase", ], srcs: [ "main.cpp", ], } + +prebuilt_etc { + name: "secure_element.rc", + src: "secure_element.rc", + installable: false, +} + +prebuilt_etc { + name: "secure_element.xml", + src: "secure_element.xml", + sub_dir: "vintf", + installable: false, +} + +apex { + name: "com.android.hardware.secure_element", + manifest: "apex_manifest.json", + file_contexts: "apex_file_contexts", + key: "com.android.hardware.key", + certificate: ":com.android.hardware.certificate", + vendor: true, + updatable: false, + + binaries: [ + "android.hardware.secure_element-service.example", + ], + prebuilts: [ + "secure_element.rc", + "secure_element.xml", + "android.hardware.se.omapi.ese.prebuilt.xml", // + ], +} diff --git a/secure_element/aidl/default/apex_file_contexts b/secure_element/aidl/default/apex_file_contexts new file mode 100644 index 0000000000..e9e811e0eb --- /dev/null +++ b/secure_element/aidl/default/apex_file_contexts @@ -0,0 +1,3 @@ +(/.*)? u:object_r:vendor_file:s0 +/etc(/.*)? u:object_r:vendor_configs_file:s0 +/bin/hw/android\.hardware\.secure_element-service\.example u:object_r:hal_secure_element_default_exec:s0 \ No newline at end of file diff --git a/secure_element/aidl/default/apex_manifest.json b/secure_element/aidl/default/apex_manifest.json new file mode 100644 index 0000000000..6e04c11209 --- /dev/null +++ b/secure_element/aidl/default/apex_manifest.json @@ -0,0 +1,4 @@ +{ + "name": "com.android.hardware.secure_element", + "version": 1 +} \ No newline at end of file diff --git a/secure_element/aidl/default/secure_element.rc b/secure_element/aidl/default/secure_element.rc index 7d216669aa..b74b2ee0cd 100644 --- a/secure_element/aidl/default/secure_element.rc +++ b/secure_element/aidl/default/secure_element.rc @@ -1,4 +1,4 @@ -service vendor.secure_element /vendor/bin/hw/android.hardware.secure_element-service.example +service vendor.secure_element /apex/com.android.hardware.secure_element/bin/hw/android.hardware.secure_element-service.example class hal user nobody group nobody