commit 4d6f479a97201687f084bc4ca87d294600b83fa4
author Yifan Hong <elsk@google.com> Tue Mar 24 17:38:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 24 17:38:15 2020 +0000
tree 9cf09c3c5731144955a3df2cb041d44ca678d7b3
parent 658c5f968e62f620f9d4741516ed23e33814229f
parent 1659ba009c86cf7ed680bc6ddfe90da5811fed90

Define SYSTEM_EXT_MANIFEST_FILES am: 9de44e272b am: 1659ba009c

Change-Id: Ic0e9f28494f77a36e082ce318af6ed263cf067c8

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 64b4b4e..e6df418 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -101,6 +101,25 @@
 include $(BUILD_PREBUILT)
 endif
 
+# System_ext Manifest
+ifneq ($(SYSTEM_EXT_MANIFEST_FILES),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := system_ext_manifest.xml
+LOCAL_MODULE_STEM := manifest.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := vintf
+GEN := $(local-generated-sources-dir)/manifest.xml
+$(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_FILES)
+$(GEN): $(SYSTEM_EXT_MANIFEST_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+	$(HOST_OUT_EXECUTABLES)/assemble_vintf \
+		-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
+		-o $@
+
+LOCAL_PREBUILT_MODULE_FILE := $(GEN)
+include $(BUILD_PREBUILT)
+endif
+
 VINTF_VNDK_VERSION :=
 FRAMEWORK_MANIFEST_INPUT_FILES :=
 DEVICE_MATRIX_INPUT_FILE :=