Skip to content

Commit c264fbf

Browse files
committed
device & rootdir: Add stub vintf xml with android.system.keystore2
Ensure framework build-time interface verification sees IKeystoreService/default as available.
1 parent 5594000 commit c264fbf

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

device.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ PRODUCT_PACKAGES += \
3333
init.gsi.rc \
3434
init.halium.rc \
3535
vndk-detect \
36-
on-post-data.sh
36+
on-post-data.sh \
37+
vintf-stub.xml
3738

3839
# bind mount target for property overrides
3940
PRODUCT_PACKAGES += \

rootdir/Android.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,11 @@ LOCAL_MODULE_TAGS := optional
4141
LOCAL_MODULE_CLASS := EXECUTABLES
4242
LOCAL_SRC_FILES := bin/on-post-data.sh
4343
include $(BUILD_PREBUILT)
44+
45+
include $(CLEAR_VARS)
46+
LOCAL_MODULE := vintf-stub.xml
47+
LOCAL_MODULE_TAGS := optional
48+
LOCAL_MODULE_CLASS := ETC
49+
LOCAL_SRC_FILES := etc/vintf-stub.xml
50+
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/vintf/manifest
51+
include $(BUILD_PREBUILT)

rootdir/etc/vintf-stub.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<manifest version="1.0" type="framework">
2+
<hal format="aidl">
3+
<name>android.system.keystore2</name>
4+
<version>2</version>
5+
<interface>
6+
<name>IKeystoreService</name>
7+
<instance>default</instance>
8+
</interface>
9+
</hal>
10+
</manifest>

0 commit comments

Comments
 (0)